This commit is contained in:
曹辉 2023-02-23 11:47:51 +08:00
parent 8b255bc2c4
commit c39942f152
6 changed files with 38 additions and 125 deletions

View File

@ -13,6 +13,7 @@
v-model="queryParams.nurseStationId" v-model="queryParams.nurseStationId"
placeholder="请选择护理站" placeholder="请选择护理站"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@change="handleQuery"
> >
<el-option <el-option
v-for="item in handstationlist" v-for="item in handstationlist"

View File

@ -9,17 +9,13 @@
label-width="100px" label-width="100px"
> >
<el-form-item label="所属护理站" prop="nurseStationName"> <el-form-item label="所属护理站" prop="nurseStationName">
<el-select <el-select @change="handleQuery" v-model="queryParams.nurseStationId" placeholder="请选择护理站">
v-model="queryParams.nurseStationId"
placeholder="请选择护理站"
>
<el-option <el-option
v-for="item in handstationlist" v-for="item in handstationlist"
:key="item.id" :key="item.id"
:label="item.nurseStationName" :label="item.nurseStationName"
:value="item.id" :value="item.id"
> ></el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商品名称" prop="goodsName"> <el-form-item label="商品名称" prop="goodsName">
@ -41,17 +37,13 @@
</el-form-item> </el-form-item>
<el-form-item label="商品用途" prop="goodsPurpose"> <el-form-item label="商品用途" prop="goodsPurpose">
<el-select <el-select v-model="queryParams.goodsPurpose" placeholder="请选择商品用途">
v-model="queryParams.goodsPurpose"
placeholder="请选择商品用途"
>
<el-option <el-option
v-for="item in goods" v-for="item in goods"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
> ></el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -62,22 +54,13 @@
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
> ></el-option>
</el-option>
</el-select> </el-select>
</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">
@ -89,8 +72,7 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:goodsInfo:add']" v-hasPermi="['system:goodsInfo:add']"
>新增</el-button >新增</el-button>
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -101,38 +83,17 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:goodsInfo:edit']" v-hasPermi="['system:goodsInfo:edit']"
>修改</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 v-loading="loading" :data="goodsInfoList" @selection-change="handleSelectionChange">
v-loading="loading"
:data="goodsInfoList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column label="所属护理站" align="center" prop="nurseStationName" />
label="所属护理站"
align="center"
prop="nurseStationName"
/>
<el-table-column label="商品编码" align="center" prop="goodsCode" /> <el-table-column label="商品编码" align="center" prop="goodsCode" />
<el-table-column <el-table-column label="商品名称" align="center" prop="goodsName" :show-overflow-tooltip="true" />
label="商品名称" <el-table-column label="商品分类名称" align="center" prop="goodsCategoryName" />
align="center"
prop="goodsName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="商品分类名称"
align="center"
prop="goodsCategoryName"
/>
<el-table-column label="商品用途" align="center" prop="goodsPurpose"> <el-table-column label="商品用途" align="center" prop="goodsPurpose">
<template slot-scope="scope"> <template slot-scope="scope">
@ -147,16 +108,10 @@
active-color="#13ce66" active-color="#13ce66"
inactive-color="#ff4949" inactive-color="#ff4949"
@change="upwhetherShelf(scope.row)" @change="upwhetherShelf(scope.row)"
> ></el-switch>
</el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="上架时间" align="center" prop="shelfTime" width="180">
label="上架时间"
align="center"
prop="shelfTime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.whetherShelf">{{ scope.row.shelfTime }}</div> <div v-if="scope.row.whetherShelf">{{ scope.row.shelfTime }}</div>
<div v-else></div> <div v-else></div>
@ -165,11 +120,8 @@
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
label="操作" chaxun
align="center"
class-name="small-padding fixed-width"
>chaxun
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -177,16 +129,14 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:goodsInfo:edit']" v-hasPermi="['system:goodsInfo: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:goodsInfo:remove']" v-hasPermi="['system:goodsInfo:remove']"
>删除</el-button >删除</el-button>
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -205,13 +155,7 @@
append-to-body append-to-body
:before-close="cancel" :before-close="cancel"
> >
<el-form <el-form ref="form" :model="form" :rules="rules" label-width="120px" :inline="true">
ref="form"
:model="form"
:rules="rules"
label-width="120px"
:inline="true"
>
<el-form-item label="护理站名称" prop="nurseStationName"> <el-form-item label="护理站名称" prop="nurseStationName">
<el-input <el-input
v-model="form.nurseStationName" v-model="form.nurseStationName"
@ -239,8 +183,7 @@
:key="isResouceShow" :key="isResouceShow"
ref="cascader" ref="cascader"
:placeholder="form.goodsCategoryName ? form.goodsCategoryName : ''" :placeholder="form.goodsCategoryName ? form.goodsCategoryName : ''"
> ></el-cascader>
</el-cascader>
<!-- <el-select <!-- <el-select
style="width: 210px" style="width: 210px"
v-model="form.goodsCategoryId" v-model="form.goodsCategoryId"
@ -254,43 +197,26 @@
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
</el-select> --> </el-select>-->
</el-form-item> </el-form-item>
<el-form-item label="商品用途" prop="goodsPurpose"> <el-form-item label="商品用途" prop="goodsPurpose">
<el-select <el-select v-model="form.goodsPurpose" placeholder="请选择商品用途" style="width: 210px">
v-model="form.goodsPurpose"
placeholder="请选择商品用途"
style="width: 210px"
>
<el-option <el-option
v-for="item in goods" v-for="item in goods"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
> ></el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商品度量单位" prop="goodsUnit"> <el-form-item label="商品度量单位" prop="goodsUnit">
<el-input <el-input v-model="form.goodsUnit" placeholder="请输入商品度量单位" style="width: 210px" />
v-model="form.goodsUnit"
placeholder="请输入商品度量单位"
style="width: 210px"
/>
</el-form-item> </el-form-item>
<el-form-item label="商品顺序" prop="sort"> <el-form-item label="商品顺序" prop="sort">
<el-input <el-input v-model.number="form.sort" placeholder="值越大排名越靠前" style="width: 210px" />
v-model.number="form.sort"
placeholder="值越大排名越靠前"
style="width: 210px"
/>
</el-form-item> </el-form-item>
<el-form-item label="商品图片" prop="goodsPictureUrl"> <el-form-item label="商品图片" prop="goodsPictureUrl">
<stationAcatar <stationAcatar @imgUrl="imgUrl" :img="form.goodsPictureUrl" :type="'goodsPictureUrl'" />
@imgUrl="imgUrl"
:img="form.goodsPictureUrl"
:type="'goodsPictureUrl'"
/>
</el-form-item> </el-form-item>
<el-table <el-table
@ -301,10 +227,7 @@
> >
<el-table-column label="商品属性名称" align="center"> <el-table-column label="商品属性名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input v-model="scope.row.attributeName" maxlength="40"></el-input>
v-model="scope.row.attributeName"
maxlength="40"
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商品单价" align="center"> <el-table-column label="商品单价" align="center">
@ -350,23 +273,12 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="addgoodAttributeDetail" <el-button size="mini" type="text" @click="addgoodAttributeDetail">新增</el-button>
>新增</el-button <el-button size="mini" type="text" @click="delgoodAttributeDetail(scope.row)">删除</el-button>
>
<el-button
size="mini"
type="text"
@click="delgoodAttributeDetail(scope.row)"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-form-item <el-form-item label="商品概述" prop="goodsRemark" style="margin-top: 20px">
label="商品概述"
prop="goodsRemark"
style="margin-top: 20px"
>
<editor <editor
@imgs="imgs" @imgs="imgs"
:min-height="100" :min-height="100"
@ -480,7 +392,7 @@
:limit.sync="getListByUserquery.pageSize" :limit.sync="getListByUserquery.pageSize"
@pagination="handleQuery2" @pagination="handleQuery2"
/> />
</el-dialog> --> </el-dialog>-->
</div> </div>
</template> </template>

View File

@ -13,6 +13,7 @@
v-model="queryParams.nurseStationId" v-model="queryParams.nurseStationId"
placeholder="请选择护理站" placeholder="请选择护理站"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@change='handleQuery'
> >
<el-option <el-option
v-for="item in handstationlist" v-for="item in handstationlist"

View File

@ -930,10 +930,8 @@ export default {
this.classifylistInfo(); this.classifylistInfo();
// //
this.checkedDataList = JSON.parse(JSON.stringify(this.form.nurseStationClassifyIds)); this.checkedDataList = JSON.parse(JSON.stringify(this.form.nurseStationClassifyIds));
this.Classifyshow = true; this.Classifyshow = true;
}, },
classifylistcancel() { classifylistcancel() {
this.classifyquery = { this.classifyquery = {
pageNum: 1, pageNum: 1,
@ -983,7 +981,6 @@ export default {
cancelClassifyshow() { cancelClassifyshow() {
// this.classifylistInfo(); // this.classifylistInfo();
this.Classifyshow = false; this.Classifyshow = false;
}, },
// //
info() { info() {

View File

@ -10,6 +10,7 @@
> >
<el-form-item label="护理站名称" prop=""> <el-form-item label="护理站名称" prop="">
<el-select <el-select
@change="handleQuery"
v-model="queryParams.nurseStationId" v-model="queryParams.nurseStationId"
placeholder="请选择护理站" placeholder="请选择护理站"
> >

View File

@ -9,7 +9,8 @@
label-width="110px" label-width="110px"
> >
<el-form-item label="护理站名称" prop="nurseStationId" label-width="100px"> <el-form-item label="护理站名称" prop="nurseStationId" label-width="100px">
<el-select v-model="queryParams.nurseStationId" placeholder="请选择护理站"> <el-select v-model="queryParams.nurseStationId" placeholder="请选择护理站"
@change="handleQuery">
<el-option <el-option
v-for="item in handstationlist" v-for="item in handstationlist"
:key="item.id" :key="item.id"