Skip to content

A
assets
Commit be3efa94 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

111

parent 1ac48582
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1463 additions and 95 deletions
src/assets/css/common.css
View file @ be3efa94
......@@ -159,6 +159,8 @@
overflow: hidden;
}
.cred{
color:#FF2A3A;
color:#F56C6C;
}
.bold{
font-family: "PingFangR";
}
src/assets/css/reset.css
View file @ be3efa94
......@@ -59,6 +59,7 @@
height: 30px;
line-height: 30px;
}
/* 图片上传 */
.el-upload-dragger{
font-size: 28px;
......@@ -87,9 +88,14 @@
.queryul li span>em{display: inline-block; min-width: 80px; text-align: right; font-style: normal; margin:0 15px 0 0;}
/* dialog */
.el-dialog__body{
padding:20px;
}
.el-dialog{
background:rgba(248,250,251,1);
border-radius:20px;
max-height:85%;
overflow-y: scroll;
}
.el-dialog__headerbtn .el-dialog__close{
color:#111111;
......@@ -132,6 +138,28 @@
.MyEditForm .el-form-item .el-form-item__error{
top: 108%;
}
.vue-treeselect--single .vue-treeselect__option--selected{
background: #28CACC;
color:#fff;
}
.vue-treeselect--single .vue-treeselect__option--selected:hover{
background: #28CACC;
color:#fff;
}
.vue-treeselect{
font-size: 12px;
font-family: '宋体';
}
/* 查询里的下拉 */
.queryul li .vue-treeselect__placeholder{
line-height: 50px;
}
.queryul li .vue-treeselect__single-value{
line-height: 50px;
}
.vue-treeselect__label{
padding:4px 0;
}
.vue-treeselect:not(.vue-treeselect--disabled):not(.vue-treeselect--focused) .vue-treeselect__control:hover{
border-color: transparent!important;
}
......@@ -142,14 +170,17 @@
}
.vue-treeselect__menu{
border-color: transparent!important;
display: block!important;
border:none;
}
.vue-treeselect__option--highlight{
background: #28CACC;
color:#fff;
}
:focus {
outline: none;
}
.vue-treeselect__menu{
border:none;
}
.MyEditForm .btnformItem{
display: block!important;
text-align: center;
......
src/assets/css/vxetable.css 0 → 100644
View file @ be3efa94
.vxe-table{
border: none;
background-color:transparent;
font-size: 12px;
font-family: '宋体';
}
.vxe-table:after, .vxe-table:before{
background-color:transparent;
}
.vxe-table .vxe-body--row .vxe-body--column{
border-bottom: 4px solid #F8FAFB;
}
.vxe-table .vxe-table--footer-wrapper, .vxe-table .vxe-table--header-wrapper{
border:none;
}
.vxe-table--header-wrapper{
background: transparent;
}
.vxe-table .vxe-header--column .vxe-cell{
color:#A6C6C6;
}
.vxe-table--header-wrapper .vxe-table--repair{
height: 0;
}
.vxe-table .vxe-body--row:hover{
box-shadow:0px 0px 20px 0px rgba(176,176,176,0.2);
transition: transform .3s ease;
cursor: pointer;
transform: scaleX(1.005);
}
.vxe-table .vxe-cell{
padding: 0 0 0 20px;
}
.vxe-table .vxe-body--row:hover td{
border-radius:0!important;
}
.vxe-table .vxe-body--row:first-child td:first-child{
border-radius:20px 0 0 0;
}
.vxe-table .vxe-body--row:first-child td:last-child{
border-radius:0 20px 0 0;
}
.vxe-table .vxe-body--row:last-child td:first-child{
border-radius:0 0 0 20px;
}
.vxe-table .vxe-body--row:last-child td:last-child{
border-radius:0 0 20px 0;
}
.vxe-icon--menu{
color:rgba(0,210,214,1);
}
.vxe-toolbar .vxe-custom--setting-btn:hover{
background: transparent;
}
.vxe-checkbox>input:checked+.vxe-checkbox--icon+.vxe-checkbox--label{
color: rgba(0,210,214,1);
}
.vxe-checkbox>input:checked+.vxe-checkbox--icon {
background-color: rgba(0,210,214,1);
border-color: rgba(0,210,214,1);
}
.vxe-checkbox .vxe-checkbox--label{
font-size: 12px;
font-family: '宋体';
font-weight: 100;
}
\ No newline at end of file
src/components/Materialman/Archivesmaterials.vue
View file @ be3efa94
......@@ -135,7 +135,7 @@
<span class="label">单位</span>
<el-input size="small" v-model="addMsg.Units"></el-input>
</el-form-item>
<el-form-item>
<el-form-item prop="Money">
<span class="label">成本价</span>
<el-input size="small" v-model="addMsg.Money"></el-input>
</el-form-item>
......@@ -236,6 +236,9 @@ export default {
BrandName:[
{ required: true, message: '请输入品牌名称', trigger: 'blur' }
],
Money:[
{ required: true, message: '请输入成本价', trigger: 'blur' }
],
},
nodemsg:{
ParentId:-1,
......
src/components/Materialman/ConsumRecipients.vue 0 → 100644
View file @ be3efa94
<template>
<div class="ConsumRecipients">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">耗材领用查询</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">
<span style="margin-right:5px">高级查询</span>
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span>
<span @click="getList" style="margin-left:20px" class="chaxunSpan">查询</span>
<!-- <span @click="chongzhi" style="margin-left:20px" class="addSpan">重置</span> -->
<!-- <span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> -->
</div>
<ul v-show="morequery" class="queryul">
<li>
<el-select size="small" v-model="msg.SuppliesId" placeholder="物料">
<el-option
v-for="item in wulaioList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</li>
<li>
<el-select size="small" filterable v-model="msg.EmployeeId" placeholder="使用人" :filter-method="getEmployee">
<el-option
v-for="item in EmployeeList"
:key="item.EmployeeId"
:label="item.EmName"
:value="item.EmployeeId">
</el-option>
</el-select>
</li>
<li>
<el-date-picker
v-model="dateList"
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="领取开始日期"
end-placeholder="领取结束日期">
</el-date-picker>
</li>
<li>
<el-select size="small" filterable v-model="addMsg.BranchId" placeholder="公司">
<el-option
v-for="item in BranchList"
:key="item.Id"
:label="item.BName"
:value="item.Id">
</el-option>
</el-select>
</li>
<li style="float:left">
<treeselect style="height:50px;width:200px;" :options="departmentata" v-model="addMsg.DepartmentId" placeholder="不限"
:normalizer="normalizer"/>
</li>
</ul>
<vxe-grid
:columns="tableColumn"
:toolbar="tableToolbar"
:data="tableData"
show-footer
:footer-method="footerMethod"
:edit-config="{trigger: 'click', mode: 'row', showStatus: true}"></vxe-grid>
<!-- -->
<!-- <vxe-table style="margin-top:15px"
:data="tableData">
<vxe-table-column field="BranchName" title="公司名称"></vxe-table-column>
<vxe-table-column field="DepartmentName" title="部门名称"></vxe-table-column>
<vxe-table-column field="EmName" title="领取人"></vxe-table-column>
<vxe-table-column field="Number" title="领取数量"></vxe-table-column>
<vxe-table-column field="Money" title="金额"></vxe-table-column>
<vxe-table-column field="SuppliesName" title="耗材名称"></vxe-table-column>
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
<vxe-table-column field="StockOutNum" title="领取单号"></vxe-table-column>
<vxe-table-column field="StockOutDate" title="领取日期"></vxe-table-column>
</vxe-table> -->
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
</template>
<script>
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: 'Supplierman',
components: {
Treeselect
},
data(){
return{
departmentata:[],
normalizer(node) {
var obj = {
id: node.DepartmentId,
label: node.DepartmentName,
};
if (node.ChildList != null && node.ChildList.length > 0) {
obj.children = node.ChildList;
}
return obj;
},
tableToolbar: {
setting: true
},
tableColumn: [
{ field: 'BranchName', title: '公司名称' },
{ field: 'DepartmentName', title: '部门名称'},
{ field: 'EmName', title: '领取人'},
{ field: 'SuppliesName', title: '耗材名称'},
{ field: 'CategoryName', title: '分类名称'},
{ field: 'StockOutNum', title: '领取单号'},
{ field: 'StockOutDate', title: '领取日期' },
{ field: 'Number', title: '领取数量'},
{ field: 'Money', title: '金额'},
],
morequery:false,
currentPage:1,
tableData: [],
loading:false,
total:0,
msg:{
pageIndex:1,
pageSize:8,
EmployeeId:'',
SuppliesId:'',
StartTime:'',
EndTime:'',
DepartmentId:null,
BranchId:'',
},
addMsg:{
Id:0,
Name:'',
Contact:'',
Mobile:'',
},
dialogtitle:'新增',
dialogState:false,
EmployeeList:[],
wulaioList:[],
wuliaomsg:{
pageIndex:1,
pageSize:1000,
Name:'',
SuppliesNum:"",
BrandName:'',
CategoryId:'',
SupplierName:''
},
BranchList:[],
dateList:[],
totalInfo:{},
}
},
mounted(){
this.getList();
this.getwuliaoList();
this.getBranch();
this.getDepartment();
},
methods:{
footerMethod ({ columns, data }) {
return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return '总计'
}
if (['Number'].includes(column.property)) {
return this.totalInfo.Number
}
if (['Money'].includes(column.property)) {
return this.totalInfo.Money
}
return '-'
})
]
},
getDepartment(){
this.apiJavaPost("/api/user/GetDepartmentTreeForReceiveQuery",{RB_Branch_Id:''},
res => {
if (res.data.resultCode === 1) {
this.departmentata=res.data.data;
console.log("this.departmentata",this.departmentata)
} else {
this.Error(res.data.message);
}
},
null
);
},
getBranch(){
this.apiJavaPost("/api/User/GetBranchList",{},
res => {
if (res.data.resultCode === 1) {
this.BranchList=res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
getwuliaoList(){
this.apiJavaPost("/api/Supplies/GetMaterialPageList",this.wuliaomsg,
res => {
if (res.data.resultCode === 1) {
this.wulaioList=res.data.data.pageData;
} else {
this.Error(res.data.message);
}
},
null
);
},
getEmployee(val){
this.apiJavaPost("/api/User/GetEmployeeList",{EmName:val},
res => {
this.loading=false;
if (res.data.resultCode === 1) {
this.EmployeeList=res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
currentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){
if(this.dateList&&this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}
else{
this.msg.StartTime='';
this.msg.EndTime='';
}
this.loading=true;
this.apiJavaPost("/api/Supplies/GetRecipientsQueryPageList",this.msg,
res => {
this.loading=false;
if (res.data.resultCode === 1) {
console.log("res",res);
let data=res.data.data;
this.tableData=data.pagelist.pageData;
this.total=data.pagelist.count;
this.totalInfo=data.Total;
} else {
this.Error(res.data.message);
}
},
null
);
},
},
}
</script>
<style >
.ConsumRecipients{
padding:20px 30px;
box-sizing: border-box;
background: #F8FAFB;
}
</style>
src/components/Materialman/Materialwarehouse.vue
View file @ be3efa94
......@@ -58,7 +58,7 @@
<el-dialog
:title="dialogtitle"
:visible.sync="dialogState"
width="20%">
width="400px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
<el-form-item prop="Name" style="margin-left:60px;">
<span class="label">仓库名称</span>
......
src/components/Materialman/SpotQuery.vue 0 → 100644
View file @ be3efa94
<template>
<div class="spotquery">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">现存量查询</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">
<span style="margin-right:5px">高级查询</span>
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span>
<span @click="getList" style="margin-left:20px" class="chaxunSpan">查询</span>
<!-- <span @click="chongzhi" style="margin-left:20px" class="addSpan">重置</span> -->
<!-- <span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> -->
</div>
<ul v-show="morequery" class="queryul">
<li>
<el-select size="small" v-model="msg.WarehouseId" placeholder="仓库">
<el-option
v-for="item in getWareHouseList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</li>
<li>
<el-select size="small" v-model="msg.SuppliesId" placeholder="物料">
<el-option
v-for="item in wulaioList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</li>
</ul>
<vxe-table style="margin-top:15px"
height="300"
:data="tableData">
<vxe-table-column field="SuppliesNum" title="耗材编码"></vxe-table-column>
<vxe-table-column field="WareHouseName" title="仓库名称"></vxe-table-column>
<vxe-table-column field="SuppliesName" title="耗材名称"></vxe-table-column>
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
<vxe-table-column field="SuppliesModel" title="耗材型号"></vxe-table-column>
<vxe-table-column field="BrandName" title="品牌"></vxe-table-column>
<vxe-table-column field="Units" title="单位"></vxe-table-column>
<vxe-table-column field="SafetyStock" title="安全库存"></vxe-table-column>
<vxe-table-column field="ReservedStock" title="预留库存"></vxe-table-column>
<vxe-table-column field="UnitPrice" title="单价"></vxe-table-column>
<vxe-table-column field="Number" title="库存数量"></vxe-table-column>
<!--
<vxe-table-column field="address" title="操作">
<template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
</template>
</vxe-table-column> -->
</vxe-table>
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
</template>
<script>
export default {
name: 'Supplierman',
data(){
return{
morequery:false,
currentPage:1,
tableData: [],
loading:false,
total:0,
msg:{
pageIndex:1,
pageSize:8,
WarehouseId:'',
SuppliesId:'',
},
addMsg:{
Id:0,
Name:'',
Contact:'',
Mobile:'',
},
dialogtitle:'新增',
dialogState:false,
getWareHouseList:[],
wuliaomsg:{
pageIndex:1,
pageSize:1000,
Name:'',
SuppliesNum:"",
BrandName:'',
CategoryId:'',
SupplierName:''
},
wulaioList:[],
}
},
mounted(){
this.getList();
this.getWareHouse();
this.getwuliaoList();
},
methods:{
// 仓库列表
getWareHouse(){
this.apiJavaPost("/api/Supplies/GetWareHouseList",{Name:''},
res => {
if (res.data.resultCode === 1) {
this.getWareHouseList=res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
getwuliaoList(){
this.apiJavaPost("/api/Supplies/GetMaterialPageList",this.wuliaomsg,
res => {
if (res.data.resultCode === 1) {
this.wulaioList=res.data.data.pageData;
} else {
this.Error(res.data.message);
}
},
null
);
},
currentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){
this.loading=true;
this.apiJavaPost("/api/Supplies/GetInventoryPageList",this.msg,
res => {
this.loading=false;
if (res.data.resultCode === 1) {
console.log("res",res);
this.tableData=res.data.data.pageData;
this.total=res.data.data.count;
} else {
this.Error(res.data.message);
}
},
null
);
},
},
}
</script>
<style scoped>
.spotquery{
padding:20px 30px;
box-sizing: border-box;
background: #F8FAFB;
}
</style>
src/components/Materialman/chukudan.vue 0 → 100644
View file @ be3efa94
This diff is collapsed.
src/components/Materialman/rukudan.vue
View file @ be3efa94
......@@ -117,6 +117,7 @@
<el-dialog
title="入库管理"
:visible.sync="dialogState"
top="2%"
width="815px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix">
......@@ -209,23 +210,24 @@
<el-dialog
title="选择物料"
:visible.sync="wuliaodig"
top="3%"
width="750px">
<el-form class="MyEditForm" :model="addMsg" label-width="0px">
<div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th width="100px">物料名称</th>
<th width="100px">分类名称</th>
<th width="100px">品牌名</th>
<th width="100px">成本价</th>
<th width="100px">供应商名称</th>
<th width="100px">条形码号</th>
<th width="100px">库存</th>
<th width="100px">型号</th>
<th width="100px">档案编码</th>
<th width="100px">操作人</th>
<th width="100px">备注</th>
<th>物料名称</th>
<th>分类名称</th>
<th>品牌名</th>
<th>成本价</th>
<th>供应商名称</th>
<th>条形码号</th>
<th>库存</th>
<th>型号</th>
<th>档案编码</th>
<th>操作人</th>
<th>备注</th>
</thead>
<tbody>
<tr v-for="(item,index) in wuliaoList" :key="index">
......@@ -558,6 +560,10 @@ export default {
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}
else{
this.msg.StartTime='';
this.msg.EndTime='';
}
this.apiJavaPost("/api/Supplies/GetStockInPageList",this.msg,
res => {
this.loading=false;
......
src/components/Systemman/AssetsClassification.vue
View file @ be3efa94
......@@ -73,29 +73,32 @@
<el-dialog
:title="dialogtitle"
:visible.sync="dialogState"
width="30%">
width="550px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
<el-form-item label="" prop="Name">
<span class="label">分类名称</span>
<el-input size="small" v-model="addMsg.Name"></el-input>
</el-form-item>
<el-form-item label="" prop="Tier">
<span class="label">层级</span>
<el-select size="small" v-model="addMsg.Tier" placeholder="请选择层级" @change="getflList(addMsg.Tier),addMsg.ParentId=''">
<el-option v-for='item in layerTierList' :label='item.name' :value='item.id' :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="ParentId">
<span class="label">上级分类</span>
<el-select size="small" v-model="addMsg.ParentId" placeholder="请选择上级分类">
<el-option v-for='item in highList' :label='item.Name' :value='item.Id' :key="item.Id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="Sort">
<span class="label">排序</span>
<el-input size="small" type="text" v-model="addMsg.Sort"
placeholder="请输入"></el-input>
</el-form-item>
<div class="basefix">
<el-form-item label="" prop="Name">
<span class="label">分类名称</span>
<el-input size="small" v-model="addMsg.Name"></el-input>
</el-form-item>
<el-form-item label="" prop="Tier">
<span class="label">层级</span>
<el-select size="small" v-model="addMsg.Tier" placeholder="请选择层级" @change="getflList(addMsg.Tier),addMsg.ParentId=''">
<el-option v-for='item in layerTierList' :label='item.name' :value='item.id' :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="ParentId">
<span class="label">上级分类</span>
<el-select size="small" v-model="addMsg.ParentId" placeholder="请选择上级分类">
<el-option v-for='item in highList' :label='item.Name' :value='item.Id' :key="item.Id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="Sort">
<span class="label">排序</span>
<el-input size="small" type="text" v-model="addMsg.Sort"
placeholder="请输入"></el-input>
</el-form-item>
</div>
<div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
<span class="exitBtn" @click="dialogState=false">取消</span>
......
src/components/Systemman/MaterialClassification.vue
View file @ be3efa94
......@@ -74,29 +74,31 @@
<el-dialog
:title="dialogtitle"
:visible.sync="dialogState"
width="30%">
width="550px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
<el-form-item label="" prop="Name">
<span class="label">分类名称</span>
<el-input size="small" v-model="addMsg.Name"></el-input>
</el-form-item>
<el-form-item label="" prop="Tier">
<span class="label">层级</span>
<el-select size="small" v-model="addMsg.Tier" placeholder="请选择层级" @change="getflList(addMsg.Tier),addMsg.ParentId=''">
<el-option v-for='item in layerTierList' :label='item.name' :value='item.id' :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="ParentId">
<span class="label">上级分类</span>
<el-select size="small" v-model="addMsg.ParentId" placeholder="请选择上级分类">
<el-option v-for='item in highList' :label='item.Name' :value='item.Id' :key="item.Id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="Sort">
<span class="label">排序</span>
<el-input size="small" type="text" v-model="addMsg.Sort"
placeholder="请输入"></el-input>
</el-form-item>
<div class="basefix">
<el-form-item label="" prop="Name">
<span class="label">分类名称</span>
<el-input size="small" v-model="addMsg.Name"></el-input>
</el-form-item>
<el-form-item label="" prop="Tier">
<span class="label">层级</span>
<el-select size="small" v-model="addMsg.Tier" placeholder="请选择层级" @change="getflList(addMsg.Tier),addMsg.ParentId=''">
<el-option v-for='item in layerTierList' :label='item.name' :value='item.id' :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="ParentId">
<span class="label">上级分类</span>
<el-select size="small" v-model="addMsg.ParentId" placeholder="请选择上级分类">
<el-option v-for='item in highList' :label='item.Name' :value='item.Id' :key="item.Id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="Sort">
<span class="label">排序</span>
<el-input size="small" type="text" v-model="addMsg.Sort"
placeholder="请输入"></el-input>
</el-form-item>
</div>
<div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
<span class="exitBtn" @click="dialogState=false">取消</span>
......
src/components/Systemman/Supplierman.vue
View file @ be3efa94
......@@ -24,7 +24,26 @@
<el-input class="w200" size="small" v-model="msg.Mobile" placeholder="联系电话"></el-input>
</li>
</ul>
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<vxe-table style="margin-top:15px"
height="300"
:data="tableData">
<vxe-table-column field="Name" title="供应商名称"></vxe-table-column>
<vxe-table-column field="Contact" title="联系人"></vxe-table-column>
<vxe-table-column field="Mobile" title="联系电话"></vxe-table-column>
<vxe-table-column field="UpdateBy" title="操作人"></vxe-table-column>
<vxe-table-column field="UpdateDate" title="操作时间"></vxe-table-column>
<vxe-table-column field="address" title="操作">
<template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
</template>
</vxe-table-column>
</vxe-table>
<!-- <table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>供应商名称</th>
<th>联系人</th>
......@@ -59,32 +78,34 @@
<td colspan="12" align="center">暂无数据</td>
</tr>
</tbody>
</table>
</table> -->
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total">
</el-pagination>
</el-pagination>
<el-dialog
:title="dialogtitle"
:visible.sync="dialogState"
width="30%">
width="530px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<el-form-item label="" prop="Name">
<span class="label">供应商名称</span>
<el-input size="small" v-model="addMsg.Name" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="" prop="Contact">
<span class="label">联系人</span>
<el-input size="small" v-model="addMsg.Contact" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="" prop="Mobile">
<span class="label">联系电话</span>
<el-input size="small" v-model="addMsg.Mobile" placeholder="请输入"></el-input>
</el-form-item>
<div class="basefix">
<el-form-item label="" prop="Name">
<span class="label">供应商名称</span>
<el-input size="small" v-model="addMsg.Name" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="" prop="Contact">
<span class="label">联系人</span>
<el-input size="small" v-model="addMsg.Contact" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="" prop="Mobile">
<span class="label">联系电话</span>
<el-input size="small" v-model="addMsg.Mobile" placeholder="请输入"></el-input>
</el-form-item>
</div>
<div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
......@@ -109,7 +130,7 @@ export default {
total:0,
msg:{
pageIndex:1,
pageSize:10,
pageSize:8,
Name:'',
Contact:'',
Mobile:'',
......@@ -234,5 +255,6 @@ export default {
.Supplierman{
padding:20px 30px;
box-sizing: border-box;
background: #F8FAFB;
}
</style>
src/components/assetsman/assetsList.vue
View file @ be3efa94
......@@ -34,9 +34,9 @@
</el-select>
</li>
<li>
<el-select size="small" v-model="msg.EmployeeId" placeholder="使用人">
<el-select size="small" filterable v-model="msg.EmployeeId" placeholder="使用人" :filter-method="getEmployee1">
<el-option
v-for="item in EmployeeList"
v-for="item in EmployeeList1"
:key="item.EmployeeId"
:label="item.EmName"
:value="item.EmployeeId">
......@@ -122,18 +122,18 @@
</tr>
</tbody>
</table>
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total">
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total">
</el-pagination>
<el-dialog
:title="dialogtitle"
:visible.sync="dialogState"
top="3%"
top="2%"
width="770px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix">
......@@ -218,9 +218,9 @@
</el-form-item>
<el-form-item label="">
<span class="label">使用人</span>
<el-select size="mini" v-model="addMsg.EmployeeId" placeholder="请选择">
<el-select size="mini" filterable v-model="addMsg.EmployeeId" placeholder="请选择" :filter-method="getEmployee2">
<el-option
v-for="item in EmployeeList"
v-for="item in EmployeeList2"
:key="item.EmployeeId"
:label="item.EmName"
:value="item.EmployeeId">
......@@ -420,11 +420,13 @@ export default {
},
OperationList:[],
OperationLoad:false,
EmployeeList1:[],
EmployeeList2:[],
EmName:'',
}
},
mounted(){
this.getList();
this.getEmployee();
this.getSupplierList1();
this.getNode();
this.getBuyType();
......@@ -611,6 +613,10 @@ export default {
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}
else{
this.msg.StartTime='';
this.msg.EndTime='';
}
this.loading=true;
this.apiJavaPost("/api/property/PropertyGetPageList",this.msg,
res => {
......@@ -650,12 +656,29 @@ export default {
null
);
},
getEmployee(){
this.apiJavaPost("/api/User/GetEmployeeList",{EmName:'刘'},
getEmployee1(val){
if(val!=''){
this.EmName=val;
this.getEmployee(1);
}
},
getEmployee2(val){
if(val!=''){
this.EmName=val;
this.getEmployee(2);
}
},
getEmployee(num){
this.apiJavaPost("/api/User/GetEmployeeList",{EmName:this.EmName},
res => {
this.loading=false;
if (res.data.resultCode === 1) {
this.EmployeeList=res.data.data;
if(num==1){
this.EmployeeList1=res.data.data;
}else{
this.EmployeeList2=res.data.data;
}
} else {
this.Error(res.data.message);
}
......
src/components/global/Nav.vue
View file @ be3efa94
......@@ -44,6 +44,9 @@
<el-menu-item index="2-2"><span>物料档案</span></el-menu-item>
<el-menu-item index="2-3"><span>入库单</span></el-menu-item>
<el-menu-item index="2-4"><span>出库单</span></el-menu-item>
<el-menu-item index="2-5"><span>现存量查询</span></el-menu-item>
<el-menu-item index="2-6"><span>耗材领用查询</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
......@@ -90,6 +93,8 @@ export default {
'2-2':'/Archivesmaterials',
'2-3':'/rukudan',
'2-4':'/chukudan',
'2-5':'/SpotQuery',
'2-6':'/ConsumRecipients',
'3-1':'/AssetsClassification',
'3-2':'/MaterialClassification',
......@@ -187,7 +192,7 @@ export default {
color:#111111!important;
}
.HeadNav .itemgroup .el-menu-item{
margin-bottom: 15px!important;
margin-bottom: 12px!important;
color: rgba(164, 188, 188, 1);
}
.HeadNav .itemgroup .el-menu-item span{
......
src/components/global/index.vue
View file @ be3efa94
......@@ -59,6 +59,7 @@ export default {
<style>
@import "../../assets/css/reset.css";
@import "../../assets/css/vxetable.css";
.appContent .routerContent{
padding-top: 70px;
position: relative;
......
src/router/config.js
View file @ be3efa94
......@@ -77,6 +77,20 @@ export default {
name: 'chukudan',
component: resolve => require(['@/components/Materialman/chukudan'], resolve),
},
// 现存量查询
{
path: '/SpotQuery',
name: 'SpotQuery',
component: resolve => require(['@/components/Materialman/SpotQuery'], resolve),
},
// 耗材领用查询
{
path: '/ConsumRecipients',
name: 'ConsumRecipients',
component: resolve => require(['@/components/Materialman/ConsumRecipients'], resolve),
},
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment