UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

第三方产品信息界面样式修改

Browse Source
prod
郑明梁 2 years ago
parent c836f98087
commit 7e6c76d74f
7 changed files with 350 additions and 292 deletions
Show Stats Download Patch File Download Diff File

2
src/assets/styles/ruoyi.scss
Unescape Escape View File

@ -317,6 +317,8 @@
.top-right-btn { .top-right-btn {
position: relative; position: relative;
float: right; float: right;
margin-bottom: 15px;
margin-top: 15px
} }

1
src/views/system/dept/index.vue
Unescape Escape View File

@ -275,7 +275,6 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd(row) { handleAdd(row) {
debugger
this.reset(); this.reset();
if (row != undefined) { if (row != undefined) {
this.form.parentId = row.deptId; this.form.parentId = row.deptId;

1
src/views/thirdSys/invProducts/thrInvProducts.vue
Unescape Escape View File

@ -240,7 +240,6 @@
}; };
getBasicThirdSys(query) getBasicThirdSys(query)
.then((response) => { .then((response) => {
debugger
this.thirdSys = response.data.list || []; this.thirdSys = response.data.list || [];
this.filterQuery.thirdSys = this.thirdSys[0].thirdId; this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
this.uploadData.thirdSys = this.filterQuery.thirdSys; this.uploadData.thirdSys = this.filterQuery.thirdSys;

19
src/views/thirdSys/product/thrProducts.vue
Unescape Escape View File

@ -69,8 +69,8 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-row>
<div class="top-right-btn" style="margin-bottom: 15px"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
@ -80,9 +80,6 @@
</el-button> </el-button>
</el-button-group> </el-button-group>
</div> </div>
</el-row>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row> <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="80"></el-table-column> <el-table-column label="序号" type="index" width="80"></el-table-column>
@ -92,12 +89,12 @@
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column> <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证" prop="registerNo" show-overflow-tooltip></el-table-column> <el-table-column label="注册/备案凭证" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column> <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="200"> <el-table-column label="操作" width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="detailDialog(scope.row)" <el-button type="text" @click.native.stop="detailDialog(scope.row)"
>详情 >详情
</el-button> </el-button>
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" <el-button type="text" @click.native.stop="deleteDialog(scope.row)"
v-if="thirdSysDetail.fromType!=0" :disabled="!configParms.basicThirdProducts" v-if="thirdSysDetail.fromType!=0" :disabled="!configParms.basicThirdProducts"
>删除 >删除
</el-button> </el-button>
@ -238,7 +235,6 @@ export default {
this.loading = true; this.loading = true;
getInvbasdoc(this.filterQuery) getInvbasdoc(this.filterQuery)
.then((response) => { .then((response) => {
debugger
// this.loading = false; // this.loading = false;
if (response.code == 20000) { if (response.code == 20000) {
this.list = response.data.list || []; this.list = response.data.list || [];
@ -423,3 +419,8 @@ export default {
}, },
}; };
</script> </script>
<style scoped>
.el-form-item--mini.el-form-item {
margin-bottom: 9px;
}
</style>

28
src/views/thirdSys/product/thrProductsExport.vue
Unescape Escape View File

@ -1,21 +1,24 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="query" class="query-form" size="mini"> <el-form :model="query" label-width="100px" size="mini" v-show="showSearch">
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-col :span="6">
<el-input v-model="filterQuery.genKey" placeholder="请输入记录ID"></el-input> <el-form-item label="记录ID:">
<el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
<el-button type="primary" icon="el-icon-top-right" @click="exportExcel">导出产品信息</el-button> <el-button type="primary" icon="el-icon-top-right" @click="exportExcel">导出产品信息</el-button>
</el-button-group> </el-button-group>
</el-form-item> </div>
</el-row> <el-divider style="margin: 15px"></el-divider>
</el-form>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="list" :data="list"
@ -55,7 +58,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="160"> <el-table-column label="操作" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -107,6 +110,7 @@ import {formatDate} from "../../../utils/date";
export default { export default {
data() { data() {
return { return {
showSearch: true,
filterQuery: { filterQuery: {
genKey: null, genKey: null,
status: null, status: null,
@ -174,7 +178,9 @@ export default {
this.total = 0; this.total = 0;
}); });
}, },
hideSearch() {
this.showSearch = !this.showSearch;
},
exportExcel() { exportExcel() {
this.selectType = 0; this.selectType = 0;
this.thrProductsSelectVisible = true; this.thrProductsSelectVisible = true;

46
src/views/thirdSys/product/thrProductsImport.vue
Unescape Escape View File

@ -1,22 +1,27 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="query" class="query-form" size="mini"> <el-form :model="query" class="query-form" label-width="100px" size="mini" v-show="showSearch">
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-col :span="6">
<el-input v-model="filterQuery.genKey" placeholder="请输入记录ID"></el-input> <el-form-item class="query-form-item" label="记录ID:">
<el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-form-item class="query-form-item"> <el-col :span="6">
<el-select v-model="filterQuery.status" placeholder="请选择处理状态"> <el-form-item class="query-form-item" label="处理状态:">
<el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择处理状态">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="处理中" value="0"></el-option> <el-option label="处理中" value="0"></el-option>
<el-option label="已处理" value="1"></el-option> <el-option label="已处理" value="1"></el-option>
<el-option label="异常" value="2"></el-option> <el-option label="异常" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> </el-col>
<el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统" @change="sysChange"> <el-col :span="6">
<el-form-item class="query-form-item" label="外部系统:">
<el-select v-model="filterQuery.thirdSysFk" style="width: 90%" placeholder="请选择第三方系统"
@change="sysChange">
<el-option <el-option
v-for="item in thirdSys" v-for="item in thirdSys"
:key="item.value" :key="item.value"
@ -27,10 +32,14 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form>
<el-form-item> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
<el-upload <el-upload
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1" v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1"
@ -44,14 +53,14 @@
> >
<el-button size="mini" type="primary">导入产品信息</el-button> <el-button size="mini" type="primary">导入产品信息</el-button>
</el-upload> </el-upload>
<el-button type="primary" icon="search" @click="downloadProducts" <el-button type="primary" icon="el-icon-download" @click="downloadProducts"
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3"> v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
下载产品信息 下载产品信息
</el-button> </el-button>
</el-button-group> </el-button-group>
</el-form-item> </div>
</el-row> <el-divider style="margin: 15px"></el-divider>
</el-form>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="list" :data="list"
@ -102,7 +111,7 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column label="操作" width="160"> <el-table-column label="操作" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -145,7 +154,7 @@
<el-dialog <el-dialog
title="下载产品信息" title="下载产品信息"
:visible.sync="thrProductsSelectVisible" :visible.sync="thrProductsSelectVisible"
width="85%" width="80%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="thrProductsSelectVisible" v-if="thrProductsSelectVisible"
@ -169,6 +178,7 @@ import axios from "axios";
export default { export default {
data() { data() {
return { return {
showSearch: true,
filterQuery: { filterQuery: {
genKey: null, genKey: null,
status: null, status: null,
@ -222,6 +232,10 @@ export default {
}; };
this.getList(); this.getList();
}, },
/*控制搜索栏显示隐藏 */
hideSearch() {
this.showSearch = !this.showSearch;
},
getList() { getList() {
this.loading = true; this.loading = true;
filterLog(this.filterQuery) filterLog(this.filterQuery)

79
src/views/thirdSys/product/thrProductsSelect.vue
Unescape Escape View File

@ -1,40 +1,60 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
<el-form-item class="query-form-item"> <el-row>
<el-col :span="6">
<el-form-item label="产品编码:">
<el-input <el-input
v-model="filterQuery.code" v-model="filterQuery.code"
placeholder="请输入产品编码/商品条码/医保编码" placeholder="请输入产品编码/商品条码/医保编码"
style="width: 90%"
@keyup.enter.native="keyupErp_submit($event)" @keyup.enter.native="keyupErp_submit($event)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> </el-col>
<el-col :span="6">
<el-form-item label="产品名称:">
<el-input <el-input
v-model="filterQuery.name" v-model="filterQuery.name"
style="width: 90%"
placeholder="请输入产品名称" placeholder="请输入产品名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> </el-col>
<el-col :span="6">
<el-form-item label="规格型号:">
<el-input <el-input
v-model="filterQuery.spec" clearable="true" v-model="filterQuery.spec" clearable="true"
style="width: 90%"
placeholder="请输入规格型号" placeholder="请输入规格型号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> </el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="注册/备案凭证:">
<el-input <el-input
v-model="filterQuery.registerNo" clearable="true" v-model="filterQuery.registerNo" clearable="true"
style="width: 90%"
placeholder="请输入注册/备案凭证" placeholder="请输入注册/备案凭证"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> </el-col>
<el-col :span="6">
<el-form-item label="生产厂家:">
<el-input <el-input
v-model="filterQuery.manufactory" clearable="true" v-model="filterQuery.manufactory" clearable="true"
style="width: 90%"
placeholder="请输入生产厂家" placeholder="请输入生产厂家"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> </el-col>
<el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange"> <el-col :span="6">
<el-form-item label="外部系统:">
<el-select v-model="filterQuery.thirdSys" style="width: 90%" placeholder="请选择第三方系统"
@change="thirdSysChange">
<el-option <el-option
v-for="item in thirdSys" v-for="item in thirdSys"
:key="item.value" :key="item.value"
@ -45,38 +65,46 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="search" @click="getList">查询</el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-top-right" @click="selectExport" v-if="selectType==0" <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
<el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0"
>选中导出 >选中导出
</el-button> </el-button>
<el-button type="primary" icon="el-icon-top-right" @click="allExport" v-if="selectType==0" <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0"
>结果全部导出 >结果全部导出
</el-button> </el-button>
<el-button type="primary" icon="el-icon-top-right" @click="uploadSmp" <el-button type="primary" icon="el-icon-top-upload" @click="uploadSmp"
v-if="selectType==1" v-if="selectType==1"
>选中上传 >选中上传
</el-button> </el-button>
<el-button type="primary" icon="el-icon-top-right" @click="allUploadSmp" <el-button type="primary" icon="el-icon-top-upload" @click="allUploadSmp"
v-if="selectType==1" v-if="selectType==1"
>一键上传 >一键上传
</el-button> </el-button>
<el-button type="primary" icon="search" @click="downloadErp" <el-button type="primary" icon="el-icon-download" @click="downloadErp"
v-if="selectType==3" v-if="selectType==3"
>选中下载 >选中下载
</el-button> </el-button>
<el-button type="primary" icon="search" @click="downloadAllErp" <el-button type="primary" icon="el-icon-download" @click="downloadAllErp"
v-if="selectType==3" v-if="selectType==3"
>结果全部下载 >结果全部下载
</el-button> </el-button>
</el-button-group> </el-button-group>
</el-form-item> </div>
</el-form> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
<el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border
highlight-current-row>
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index" width="80"></el-table-column> <el-table-column label="序号" type="index" width="80"></el-table-column>
<el-table-column label="产品编码" prop="code"></el-table-column> <el-table-column label="产品编码" prop="code"></el-table-column>
@ -85,7 +113,7 @@
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column> <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
<el-table-column label="注册证号" prop="registerNo" show-overflow-tooltip></el-table-column> <el-table-column label="注册证号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column> <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="detailDialog(scope.row)" <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row)"
>详情 >详情
@ -144,6 +172,7 @@ export default {
}, },
data() { data() {
return { return {
showSearch: true,
filterQuery: { filterQuery: {
thrProductsEntities: [], thrProductsEntities: [],
code: null, code: null,
@ -205,6 +234,9 @@ export default {
this.total = 0; this.total = 0;
}); });
}, },
hideSearch() {
this.showSearch = !this.showSearch;
},
clearAll() { clearAll() {
this.$confirm("此操作将清空所有产品信息, 是否继续?", "提示", { this.$confirm("此操作将清空所有产品信息, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -432,3 +464,8 @@ export default {
}, },
}; };
</script> </script>
<style scoped>
.el-form-item--mini.el-form-item {
margin-bottom: 9px;
}
</style>

Write Preview
Loading…
Cancel
Save