Merge remote-tracking branch 'origin/dev'
# Conflicts: # src/views/system/OperateGoodsInfo/index.vue
This commit is contained in:
commit
da1ee2af03
79
src/api/system/area.js
Normal file
79
src/api/system/area.js
Normal file
@ -0,0 +1,79 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
|
||||
// 查询区域列表(不分页) 点击push
|
||||
export function selectAreaList(areaName, parentCode) {
|
||||
return request({
|
||||
url: `/system/area/selectAreaList?areaName=${areaName}&parentCode=${parentCode}`,
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
//搜索
|
||||
// 查询区域列表(不分页)
|
||||
export function selectAreaListquery(areaName) {
|
||||
return request({
|
||||
url: `/system/area/selectAreaList?areaName=${areaName}`,
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
//开局
|
||||
// 查询区域列表(不分页)
|
||||
export function selectAreaListinfo(areaName) {
|
||||
return request({
|
||||
url: `/system/area/selectAreaList?areaLevel=${areaName}`,
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
// 查询区域列表
|
||||
export function listArea(query) {
|
||||
return request({
|
||||
url: '/system/area/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询区域详细
|
||||
export function getArea(id) {
|
||||
return request({
|
||||
url: '/system/area/' + id,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增区域
|
||||
export function addArea(data) {
|
||||
return request({
|
||||
url: '/system/area/add',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改区域
|
||||
export function updateArea(data) {
|
||||
return request({
|
||||
url: '/system/area/edit',
|
||||
method: 'POST',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除区域
|
||||
export function delArea(id) {
|
||||
return request({
|
||||
url: '/system/area/' + id,
|
||||
method: 'POST'
|
||||
})
|
||||
}
|
||||
|
||||
//边远地区
|
||||
export function updateRemoteSigns(id, remoteSigns) {
|
||||
return request({
|
||||
url: `/system/area/updateRemoteSigns?id=${id}&remoteSigns=${remoteSigns}`,
|
||||
method: 'POST'
|
||||
})
|
||||
}
|
||||
@ -122,7 +122,6 @@
|
||||
align="center"
|
||||
prop="goodsCategoryName"
|
||||
/>
|
||||
|
||||
<el-table-column label="商品用途" align="center" prop="goodsPurpose">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.goodsPurpose == "BUSINESS" ? "买卖" : "" }}
|
||||
@ -151,7 +150,6 @@
|
||||
<div v-else></div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" />
|
||||
<el-table-column label="创建人" align="center" prop="createBy" />
|
||||
<el-table-column
|
||||
@ -214,7 +212,7 @@
|
||||
@click="clickinnerVisible"
|
||||
v-if="StationName == '请选择所属护理站'"
|
||||
style="
|
||||
width: 200px;
|
||||
width: 210px;
|
||||
text-align: left;
|
||||
height: 36px;
|
||||
color: #c0c4cc;
|
||||
@ -227,10 +225,9 @@
|
||||
@click="clickinnerVisible"
|
||||
v-else
|
||||
style="
|
||||
width: 200px;
|
||||
width: 210px;
|
||||
text-align: left;
|
||||
height: 36px;
|
||||
padding-left: -10px;
|
||||
overflow: hidden;
|
||||
"
|
||||
>{{ StationName }}</el-button
|
||||
@ -269,11 +266,20 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="商品度量单位" prop="goodsUnit">
|
||||
<el-input
|
||||
max="8"
|
||||
v-model="form.goodsUnit"
|
||||
placeholder="请输入商品度量单位"
|
||||
style="width: 210px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="商品顺序" prop="sort">
|
||||
<el-input
|
||||
max="8"
|
||||
v-model.number="form.sort"
|
||||
placeholder="值越大排名越靠前"
|
||||
style="width: 210px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="商品图片" prop="goodsPictureUrl">
|
||||
<stationAcatar
|
||||
@imgUrl="imgUrl"
|
||||
@ -298,7 +304,6 @@
|
||||
<el-table-column label="商品单价" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
|
||||
v-model="scope.row.goodsPrice"
|
||||
type="number"
|
||||
oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>7){value=value.slice(0,7)}"
|
||||
@ -316,11 +321,12 @@
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="显示顺序" align="center">
|
||||
<el-table-column label="商品属性顺序" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="scope.row.attributeDetailsSort"
|
||||
v-model.number="scope.row.attributeDetailsSort"
|
||||
oninput="value=value.replace(/[^\d]/g,'')"
|
||||
placeholder="值越大排名越靠前"
|
||||
maxLength="9"
|
||||
></el-input>
|
||||
</template>
|
||||
@ -356,7 +362,7 @@
|
||||
style="margin-top: 20px"
|
||||
>
|
||||
<editor
|
||||
@imgs="imgs"
|
||||
@imgs="imgs"
|
||||
:min-height="100"
|
||||
style="width: 90%; margin: 0 auto"
|
||||
v-model="form.goodsRemark"
|
||||
|
||||
@ -20,7 +20,6 @@ export default {
|
||||
return {
|
||||
imgsurl: { pictureUrlList: [] },
|
||||
imgone: "",
|
||||
|
||||
imageUrl: "", //商品图片
|
||||
value: "",
|
||||
datas: null,
|
||||
@ -124,7 +123,11 @@ export default {
|
||||
{ required: true, message: "请输入商品度量单位", trigger: "blur" },
|
||||
],
|
||||
goodsPictureUrl: [
|
||||
{ required: true, message: "请输入选择图片", trigger: "blur" },
|
||||
{ required: true, message: "请选择图片", trigger: "blur" },
|
||||
],
|
||||
sort: [
|
||||
{ required: true, message: "请输入商品顺序", trigger: "blur" },
|
||||
|
||||
],
|
||||
},
|
||||
homestation: null,
|
||||
@ -138,7 +141,7 @@ export default {
|
||||
imgs(item) {
|
||||
this.imgsurl.pictureUrlList.push(item);
|
||||
// console.log(this.imgsurl)
|
||||
},
|
||||
},
|
||||
upwhetherShelf(row) {
|
||||
console.log(row);
|
||||
if (row.whetherShelf == false) {
|
||||
@ -180,20 +183,19 @@ export default {
|
||||
},
|
||||
// 添加
|
||||
addgoodAttributeDetail() {
|
||||
console.log(this.goodDetailsLists);
|
||||
if (this.goodDetailsLists.length == 5) {
|
||||
this.$message.error("最多只能5条");
|
||||
} else {
|
||||
this.ids++;
|
||||
var obj = {
|
||||
attributePitureUrl: "",
|
||||
goodsPrice: "",
|
||||
goodsStock: "",
|
||||
sort: "",
|
||||
ids: this.ids,
|
||||
};
|
||||
this.goodDetailsLists.push(obj);
|
||||
}
|
||||
// if (this.goodDetailsLists.length == 5) {
|
||||
// this.$message.error("最多只能5条");
|
||||
// } else {
|
||||
this.ids++;
|
||||
var obj = {
|
||||
attributePitureUrl: "",
|
||||
goodsPrice: "",
|
||||
goodsStock: "",
|
||||
attributeDetailsSort: null,
|
||||
ids: this.ids,
|
||||
};
|
||||
this.goodDetailsLists.push(obj);
|
||||
// }
|
||||
},
|
||||
// 删除
|
||||
delgoodAttributeDetail(item) {
|
||||
@ -231,8 +233,8 @@ export default {
|
||||
}
|
||||
if (this.imgsurl.pictureUrlList.length > 0) {
|
||||
updatePicture(this.imgsurl).then((res) => {});
|
||||
}
|
||||
this.imgsurl={pictureUrlList:[]};
|
||||
}
|
||||
this.imgsurl = { pictureUrlList: [] };
|
||||
this.open = false;
|
||||
this.reset();
|
||||
this.StationName = "请选择所属护理站";
|
||||
@ -242,7 +244,7 @@ export default {
|
||||
attributePitureUrl: "",
|
||||
goodsPrice: "",
|
||||
goodsStock: "",
|
||||
sort: "",
|
||||
attributeDetailsSort: null,
|
||||
}, ],
|
||||
}, ];
|
||||
},
|
||||
@ -308,7 +310,7 @@ export default {
|
||||
attributePitureUrl: "",
|
||||
goodsPrice: "",
|
||||
goodsStock: "",
|
||||
sort: "",
|
||||
attributeDetailsSort: null,
|
||||
ids: 9999999,
|
||||
}, ];
|
||||
this.resetForm("form");
|
||||
@ -350,7 +352,7 @@ export default {
|
||||
attributePitureUrl: "",
|
||||
goodsPrice: "",
|
||||
goodsStock: "",
|
||||
sort: "",
|
||||
sort: null,
|
||||
ids: 9999999,
|
||||
}, ];
|
||||
this.open = true;
|
||||
@ -387,13 +389,17 @@ export default {
|
||||
this.form.id = this.form.goodsInfoId;
|
||||
this.form.goodDetailsLists.forEach(e => {
|
||||
e.goodsPrice = Number(e.goodsPrice)
|
||||
if (e.attributeDetailsSort == '') {
|
||||
e.attributeDetailsSort = null
|
||||
}
|
||||
// e.sort = e.attributeDetailsSort
|
||||
})
|
||||
updateGoodsInfo(this.form).then((response) => {
|
||||
var obj = { pictureUrlList: [] };
|
||||
if (this.imgone != this.form.goodsPictureUrl) {
|
||||
obj.pictureUrlList.push(this.imgone);
|
||||
}
|
||||
this.imgsurl={pictureUrlList:[]};
|
||||
this.imgsurl = { pictureUrlList: [] };
|
||||
if (obj.pictureUrlList.length > 0) {
|
||||
updatePicture(obj).then((res) => {
|
||||
console.log(res);
|
||||
@ -406,9 +412,9 @@ export default {
|
||||
});
|
||||
} else {
|
||||
this.form.goodDetailsLists.forEach(e => {
|
||||
e.goodsPrice = Number(e.goodsPrice)
|
||||
})
|
||||
// this.nurseStationId=this.form.nurseStationId
|
||||
e.goodsPrice = Number(e.goodsPrice)
|
||||
})
|
||||
// this.nurseStationId=this.form.nurseStationId
|
||||
addGoodsInfo(this.form).then((response) => {
|
||||
console.log(this.form);
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
@ -482,4 +488,4 @@ export default {
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
};
|
||||
605
src/views/system/area/index.vue
Normal file
605
src/views/system/area/index.vue
Normal file
@ -0,0 +1,605 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-row :gutter="20">
|
||||
<!--部门数据-->
|
||||
<el-col :span="4" :xs="24">
|
||||
<div class="head-container">
|
||||
<el-input
|
||||
v-model="areaName"
|
||||
placeholder="请输入区域名称"
|
||||
clearable
|
||||
size="small"
|
||||
prefix-icon="el-icon-search"
|
||||
style="margin-bottom: 20px"
|
||||
/>
|
||||
</div>
|
||||
<div class="head-container" style="height: 580px; overflow-y: auto">
|
||||
<el-tree
|
||||
:data="deptOptions"
|
||||
:props="defaultProps"
|
||||
@node-click="handleNodeClick"
|
||||
@node-expand="handleNodeClick"
|
||||
></el-tree>
|
||||
</div>
|
||||
</el-col>
|
||||
<!--用户数据-->
|
||||
<el-col :span="20" :xs="24">
|
||||
<el-form
|
||||
:model="queryParams"
|
||||
ref="queryForm"
|
||||
size="small"
|
||||
:inline="true"
|
||||
v-show="showSearch"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item label="区域名称" prop="areaName">
|
||||
<el-input
|
||||
v-model="queryParams.areaName"
|
||||
placeholder="请输入区域名称"
|
||||
clearable
|
||||
@keyup.enter.native="resethandleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="区域编码" prop="areaCode">
|
||||
<el-input
|
||||
v-model="queryParams.areaCode"
|
||||
placeholder="请输入区域编码"
|
||||
clearable
|
||||
@keyup.enter.native="resethandleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
size="mini"
|
||||
@click="resethandleQuery"
|
||||
>搜索</el-button
|
||||
>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
||||
>重置</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<!-- <el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['system:area:add']"
|
||||
>新增</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['system:area:edit']"
|
||||
>修改</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['system:area:remove']"
|
||||
>删除</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['system:area:export']"
|
||||
>导出</el-button
|
||||
>
|
||||
</el-col>
|
||||
<right-toolbar
|
||||
:showSearch.sync="showSearch"
|
||||
@queryTable="getList"
|
||||
></right-toolbar>
|
||||
</el-row> -->
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="areaList"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!-- <el-table-column label="父级id" align="center" prop="parentId" /> -->
|
||||
<el-table-column label="区域名称" align="center" prop="areaName" />
|
||||
<el-table-column label="区域编码" align="center" prop="areaCode" />
|
||||
<el-table-column label="偏远地区" align="center" prop="remoteSigns">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.remoteSigns"
|
||||
active-color="#13ce66"
|
||||
inactive-color="#ff4949"
|
||||
@change="updateRemoteSigns(scope.row)"
|
||||
>
|
||||
</el-switch>
|
||||
|
||||
<!-- {{ scope.row.remoteSigns == 0 ? "否" : "是" }} -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-circle-plus-outline"
|
||||
@click="handleadd(scope.row)"
|
||||
v-hasPermi="['system:area:add']"
|
||||
>新增</el-button
|
||||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['system:area:edit']"
|
||||
>修改</el-button
|
||||
>
|
||||
<!-- <el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:area:remove']"
|
||||
>删除</el-button
|
||||
> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- 添加或修改区域对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
|
||||
<el-form-item
|
||||
label="父级区域名称"
|
||||
prop="parentName"
|
||||
:required="true"
|
||||
v-if="form.parentName"
|
||||
>
|
||||
<el-input
|
||||
v-model="form.parentName"
|
||||
placeholder="请输入父级区域名称"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="父级区域编码"
|
||||
prop="parentCode"
|
||||
:required="true"
|
||||
v-if="form.parentCode"
|
||||
>
|
||||
<el-input
|
||||
v-model="form.parentCode"
|
||||
placeholder="请输入父级区域编码"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="区域名称" prop="areaName">
|
||||
<el-input v-model="form.areaName" placeholder="请输入区域名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="区域编码" prop="areaCode">
|
||||
<el-input v-model="form.areaCode" placeholder="请输入区域编码" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="区域级别" prop="areaLevel">
|
||||
<el-input v-model="form.areaLevel" placeholder="请输入区域级别" />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="偏远地区" prop="remoteSigns">
|
||||
<el-radio v-model="form.remoteSigns" label="0">否</el-radio>
|
||||
<el-radio v-model="form.remoteSigns" label="1">是</el-radio>
|
||||
</el-form-item>
|
||||
<el-form-item label="排序" prop="">
|
||||
<el-input v-model.number="form.sort" placeholder="请输入排序" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
listArea,
|
||||
getArea,
|
||||
delArea,
|
||||
addArea,
|
||||
updateArea,
|
||||
selectAreaList,
|
||||
selectAreaListinfo,
|
||||
selectAreaListquery,
|
||||
updateRemoteSigns,
|
||||
} from "@/api/system/area";
|
||||
|
||||
export default {
|
||||
name: "Area",
|
||||
data() {
|
||||
return {
|
||||
// 省级树选项
|
||||
deptOptions: undefined,
|
||||
defaultProps: {
|
||||
children: "children",
|
||||
label: "areaName",
|
||||
},
|
||||
areaName: "",
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 区域表格数据
|
||||
areaList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
parentId: null,
|
||||
areaCode: null,
|
||||
areaName: null,
|
||||
areaLevel: null,
|
||||
sort: null,
|
||||
areaType: null,
|
||||
parentCode: null,
|
||||
remoteSigns: null,
|
||||
},
|
||||
// 表单参数
|
||||
form: {
|
||||
remoteSigns: '0',
|
||||
},
|
||||
// 表单校验
|
||||
rules: {
|
||||
areaCode: [
|
||||
{ required: true, message: "请输入区域编码", trigger: "blur" },
|
||||
],
|
||||
areaName: [
|
||||
{ required: true, message: "请输入区域名称", trigger: "blur" },
|
||||
],
|
||||
areaLevel: [
|
||||
{ required: true, message: "请输入区域级别", trigger: "blur" },
|
||||
],
|
||||
remoteSigns: [
|
||||
{ required: true, message: "请选择是否是偏远地区", trigger: "blur" },
|
||||
],
|
||||
},
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.selectAreaListin();
|
||||
},
|
||||
watch: {
|
||||
// 根据名称筛选部门树
|
||||
areaName(val) {
|
||||
if (val) {
|
||||
if (val.includes(" ")) {
|
||||
this.areaName = "";
|
||||
return;
|
||||
} else {
|
||||
selectAreaListquery(val).then((res) => {
|
||||
this.deptOptions = res.data;
|
||||
});
|
||||
}
|
||||
} else {
|
||||
if (val.includes(" ")) {
|
||||
} else {
|
||||
this.selectAreaListin();
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
//修改是否为边远地区
|
||||
updateRemoteSigns(row) {
|
||||
if (row.remoteSigns) {
|
||||
this.$confirm('确定修改"' + row.areaName + '"为偏远地区吗?', {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning",
|
||||
})
|
||||
.then(() => {
|
||||
var remoteSigns = null;
|
||||
if (row.remoteSigns) {
|
||||
remoteSigns = 1;
|
||||
} else {
|
||||
remoteSigns = 0;
|
||||
}
|
||||
updateRemoteSigns(row.id, remoteSigns).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.$message({
|
||||
type: "success",
|
||||
message: "修改为偏远地区!",
|
||||
});
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
row.remoteSigns = false;
|
||||
this.$message({
|
||||
type: "info",
|
||||
message: "取消修改",
|
||||
});
|
||||
});
|
||||
} else {
|
||||
this.$confirm('确定修改"' + row.areaName + '"为非偏远地区吗吗?', {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning",
|
||||
})
|
||||
.then(() => {
|
||||
var remoteSigns = null;
|
||||
if (row.remoteSigns) {
|
||||
remoteSigns = 1;
|
||||
} else {
|
||||
remoteSigns = 0;
|
||||
}
|
||||
updateRemoteSigns(row.id, remoteSigns).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.$message({
|
||||
type: "success",
|
||||
message: "修改为非偏远地区!",
|
||||
});
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
row.remoteSigns = true;
|
||||
this.$message({
|
||||
type: "info",
|
||||
message: "取消修改",
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
// 节点单击事件
|
||||
handleNodeClick(data) {
|
||||
this.queryParams.areaLevel = null;
|
||||
this.loading = true;
|
||||
this.queryParams.parentCode = data.areaCode;
|
||||
if (data.areaCode != 1) {
|
||||
this.handleQuery();
|
||||
selectAreaList("", data.areaCode).then((res) => {
|
||||
if (res.data.length > 0) {
|
||||
res.data.forEach((e) => {
|
||||
e.children = [
|
||||
{
|
||||
areaName: "",
|
||||
},
|
||||
];
|
||||
});
|
||||
} else {
|
||||
this.queryParams.parentCode = null;
|
||||
}
|
||||
data.children = res.data;
|
||||
this.loading = false;
|
||||
});
|
||||
} else {
|
||||
this.queryParams.parentCode = null;
|
||||
this.queryParams.areaLevel = 1;
|
||||
this.handleQuery();
|
||||
selectAreaListinfo(1).then((res) => {
|
||||
if (res.data.length > 0) {
|
||||
res.data.forEach((e) => {
|
||||
e.children = [
|
||||
{
|
||||
areaName: "",
|
||||
},
|
||||
];
|
||||
});
|
||||
} else {
|
||||
this.queryParams.parentCode = null;
|
||||
}
|
||||
this.loading = false;
|
||||
data.children = res.data;
|
||||
});
|
||||
}
|
||||
},
|
||||
selectAreaListin() {
|
||||
this.loading = true;
|
||||
selectAreaListinfo(1).then((res) => {
|
||||
res.data.forEach((e) => {
|
||||
e.children = [
|
||||
{
|
||||
areaName: "",
|
||||
},
|
||||
];
|
||||
});
|
||||
var obj = [
|
||||
{
|
||||
areaName: "区域列表",
|
||||
children: res.data,
|
||||
areaCode: 1,
|
||||
},
|
||||
];
|
||||
this.deptOptions = obj;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
info() {
|
||||
this.loading = true;
|
||||
selectAreaList(this.areaName).then((res) => {
|
||||
this.loading = false;
|
||||
var obj = {
|
||||
areaName: "区域列表",
|
||||
children: res.data,
|
||||
};
|
||||
this.deptOptions = obj;
|
||||
});
|
||||
},
|
||||
/** 查询区域列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listArea(this.queryParams).then((response) => {
|
||||
response.rows.forEach((e) => {
|
||||
if (e.remoteSigns == 1) {
|
||||
e.remoteSigns = true;
|
||||
} else {
|
||||
e.remoteSigns = false;
|
||||
}
|
||||
});
|
||||
this.areaList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
id: null,
|
||||
parentName: null,
|
||||
parentId: null,
|
||||
areaCode: null,
|
||||
areaName: null,
|
||||
areaLevel: null,
|
||||
sort: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null,
|
||||
areaType: null,
|
||||
parentCode: null,
|
||||
remoteSigns: '0',
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
resethandleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.queryParams.pageSize = 10;
|
||||
this.queryParams.areaLevel = null;
|
||||
this.queryParams.parentName = null;
|
||||
this.getList();
|
||||
},
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.queryParams.parentCode = null;
|
||||
this.queryParams.areaLevel = 1;
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map((item) => item.id);
|
||||
this.single = selection.length !== 1;
|
||||
this.multiple = !selection.length;
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleadd(row) {
|
||||
this.reset();
|
||||
this.form.parentId = row.id;
|
||||
this.form.parentCode = row.areaCode;
|
||||
this.form.parentName = row.areaName;
|
||||
this.form.areaLevel = row.areaLevel;
|
||||
this.title = "添加区域";
|
||||
this.open = true;
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const id = row.id || this.ids;
|
||||
getArea(id).then((response) => {
|
||||
response.data.remoteSigns = String(response.data.remoteSigns);
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改区域";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
if (valid) {
|
||||
if (this.form.id != null) {
|
||||
updateArea(this.form).then((response) => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addArea(this.form).then((response) => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.queryParams.parentCode = this.form.parentCode;
|
||||
this.queryParams.areaLevel = null;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$modal
|
||||
.confirm('是否确认删除区域名称为"' + row.areaName + '"的数据项吗?')
|
||||
.then(function () {
|
||||
return delArea(ids);
|
||||
})
|
||||
.then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download(
|
||||
"system/area/export",
|
||||
{
|
||||
...this.queryParams,
|
||||
},
|
||||
`area_${new Date().getTime()}.xlsx`
|
||||
);
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
@ -36,6 +36,14 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="联系电话" prop="phone">
|
||||
<el-input
|
||||
v-model="queryParams.phone"
|
||||
placeholder="请输入联系电话"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
@ -121,6 +129,12 @@
|
||||
prop="orderTime"
|
||||
width="180"
|
||||
/>
|
||||
<el-table-column
|
||||
label="联系电话"
|
||||
align="center"
|
||||
prop="phone"
|
||||
width="180"
|
||||
/>
|
||||
<el-table-column label="下单方式" align="center" prop="orderChannel">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.orderChannel == "MOBILE_APP" ? "手机APP" : "" }}
|
||||
@ -128,7 +142,7 @@
|
||||
{{ scope.row.orderChannel == "ALI_PAY_APPLET" ? "支付宝小程序" : "" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注信息" align="center" prop="remark" />
|
||||
<!-- <el-table-column label="备注信息" align="center" prop="remark" /> -->
|
||||
<el-table-column label="录入物流单号" align="center" prop="remark">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
|
||||
@ -112,6 +112,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="会员名称" align="center" prop="patientName" />
|
||||
<el-table-column label="护理员" align="center" prop="nursePersonName" />
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
|
||||
@ -162,7 +162,7 @@ export default {
|
||||
methods: {
|
||||
imgs(item) {
|
||||
this.imgsurl.pictureUrlList.push(item);
|
||||
},
|
||||
},
|
||||
imgUrl(imgUrl) {
|
||||
this.form.stationPictureUrl = imgUrl;
|
||||
},
|
||||
@ -254,10 +254,13 @@ export default {
|
||||
}
|
||||
if (this.imgsurl.pictureUrlList.length > 0) {
|
||||
updatePicture(this.imgsurl).then((res) => {});
|
||||
}
|
||||
this.imgsurl={pictureUrlList:[]};
|
||||
}
|
||||
this.imgsurl = { pictureUrlList: [] };
|
||||
this.open = false;
|
||||
this.reset();
|
||||
this.arealist = []
|
||||
this.citylist = []
|
||||
this.streetlist = []
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
@ -373,7 +376,7 @@ export default {
|
||||
if (this.imgtwo != this.form.stationPictureUrl) {
|
||||
obj.pictureUrlList.push(this.imgtwo);
|
||||
}
|
||||
this.imgsurl={pictureUrlList:[]};
|
||||
this.imgsurl = { pictureUrlList: [] };
|
||||
if (obj.pictureUrlList.length > 0) {
|
||||
updatePicture(obj).then((res) => {});
|
||||
}
|
||||
@ -458,4 +461,4 @@ export default {
|
||||
this.upload.isUploading = true;
|
||||
},
|
||||
},
|
||||
};
|
||||
};
|
||||
@ -72,7 +72,7 @@
|
||||
</el-button>
|
||||
</el-upload>
|
||||
</el-col>
|
||||
<el-col :lg="{ span: 1, offset: 2 }" :md="2">
|
||||
<!-- <el-col :lg="{ span: 1, offset: 2 }" :md="2">
|
||||
<el-button
|
||||
icon="el-icon-plus"
|
||||
size="small"
|
||||
@ -99,8 +99,8 @@
|
||||
size="small"
|
||||
@click="rotateRight()"
|
||||
></el-button>
|
||||
</el-col>
|
||||
<el-col :lg="{ span: 2, offset: 6 }" :md="2">
|
||||
</el-col> -->
|
||||
<el-col :lg="{ span: 2, offset: 20 }" :md="2">
|
||||
<el-button type="primary" size="small" @click="uploadImg()"
|
||||
>提 交</el-button
|
||||
>
|
||||
@ -217,19 +217,21 @@ export default {
|
||||
// 上传图片
|
||||
uploadImg() {
|
||||
let formData = new FormData();
|
||||
formData.append("file", this.previews.data);
|
||||
formData.append("type", this.types);
|
||||
updateNurseStationHeads(formData).then((response) => {
|
||||
this.options.img = baseurl + response.imgUrl;
|
||||
this.$emit("imgUrl", response.imgUrl);
|
||||
console.log(this.items);
|
||||
console.log(this.types);
|
||||
if (this.types == "attributePitureUrl") {
|
||||
this.items.attributePitureUrl = response.imgUrl;
|
||||
this.$emit("item", JSON.stringify(this.items));
|
||||
}
|
||||
if (this.previews.data) {
|
||||
formData.append("file", this.previews.data);
|
||||
formData.append("type", this.types);
|
||||
updateNurseStationHeads(formData).then((response) => {
|
||||
this.options.img = baseurl + response.imgUrl;
|
||||
this.$emit("imgUrl", response.imgUrl);
|
||||
if (this.types == "attributePitureUrl") {
|
||||
this.items.attributePitureUrl = response.imgUrl;
|
||||
this.$emit("item", JSON.stringify(this.items));
|
||||
}
|
||||
this.openimg = false;
|
||||
});
|
||||
} else {
|
||||
this.openimg = false;
|
||||
});
|
||||
}
|
||||
},
|
||||
// 实时预览
|
||||
realTime(data) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user