Skip to content

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

update

parent 306e199d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1829 additions and 1827 deletions
src/App.vue
View file @ 2122584f
...@@ -13,7 +13,7 @@ export default { ...@@ -13,7 +13,7 @@ export default {
</script> </script>
<style> <style>
@import "//at.alicdn.com/t/font_1544586_n4jd8ww9mz.css"; @import "//at.alicdn.com/t/font_1544586_kc9j119l3w.css";
@import "./assets/css/common.css"; @import "./assets/css/common.css";
@import './assets/global/font.css'; @import './assets/global/font.css';
@import "./assets/css/reset.css"; @import "./assets/css/reset.css";
......
src/assets/css/common.css
View file @ 2122584f
.routerTitle{
background: #fff;
padding:15px 30px;
}
.padContent{
padding:15px 30px;
box-sizing: border-box;
}
.chartTitle .el-input__icon{ .chartTitle .el-input__icon{
line-height:0; line-height:0;
color:#fff!important; color:#fff!important;
...@@ -62,7 +70,8 @@ ...@@ -62,7 +70,8 @@
content: "\2713";background-color: #fff; content: "\2713";background-color: #fff;
position: absolute;top: 0;left: 0; position: absolute;top: 0;left: 0;
width:100%;border: 1px solid #00D2D6;color:#00D2D6; width:100%;border: 1px solid #00D2D6;color:#00D2D6;
font-size: 18px;font-weight: bold; font-size: 18px;
font-family: "PingFangR";
} }
/* myTable */ /* myTable */
.myTable{ .myTable{
...@@ -83,12 +92,12 @@ ...@@ -83,12 +92,12 @@
background:transparent!important; background:transparent!important;
} }
.myTable .hoverSpan1{ /* .myTable .hoverSpan1{
left: -20px; left: -20px;
} }
.myTable .hoverSpan2{ .myTable .hoverSpan2{
right: -20px; right: -20px;
} } */
.myTable .commonStyle{ .myTable .commonStyle{
height:100%; height:100%;
background:#fff; background:#fff;
...@@ -100,16 +109,30 @@ ...@@ -100,16 +109,30 @@
.miniTable tr td{ .miniTable tr td{
padding:6px 0 6px 20px!important; padding:6px 0 6px 20px!important;
} }
.myTable tr{ .myTable tbody tr{
background:#fff; background:#fff;
border-bottom: 4px solid #F8FAFB; border-bottom: 1px solid #F8FAFB;
cursor: pointer; cursor: pointer;
} }
.myTable tbody tr:last-child{
border-bottom: none;
}
.noHoverTable tr{ .noHoverTable tr{
border-bottom:none!important; border-bottom:none!important;
} }
.noHoverTable tr:nth-child(even){
background: #fff!important;
}
.myTable tr:nth-child(even){
background: #F6F9FB;
}
.myTable tbody .trNobottom:first-child{
border-top: none!important;
}
.myTable .trNobottom{ .myTable .trNobottom{
border-top: 4px solid #F8FAFB!important; border-top: 1px solid #E2E4EB!important;
border-bottom:none!important; border-bottom:none!important;
} }
.myTable tbody tr:hover{ .myTable tbody tr:hover{
...@@ -121,7 +144,7 @@ ...@@ -121,7 +144,7 @@
box-shadow:0 0 0 transparent!important; box-shadow:0 0 0 transparent!important;
} }
.myTable tbody tr:hover .commonStyle{ .myTable tbody tr:hover .commonStyle{
display: block; /* display: block; */
transition: transform .5s ease; transition: transform .5s ease;
box-shadow:0px 0px 0px 0px rgba(176,176,176,0.2); box-shadow:0px 0px 0px 0px rgba(176,176,176,0.2);
...@@ -141,6 +164,20 @@ ...@@ -141,6 +164,20 @@
.myTable tbody tr:last-child td:last-child{ .myTable tbody tr:last-child td:last-child{
border-radius:0 0 20px 0; border-radius:0 0 20px 0;
} }
/* 合并无圆角 */
.noHoverTable tbody tr:first-child td:first-child{
border-radius:0!important;
}
.noHoverTable tbody tr:first-child td:last-child{
border-radius:0!important;
}
.noHoverTable tbody tr:last-child td:first-child{
border-radius:0!important;
}
.noHoverTable tbody tr:last-child td:last-child{
border-radius:0!important;
}
.myTable tr td{ .myTable tr td{
position: relative; position: relative;
padding:11px 0 11px 20px; padding:11px 0 11px 20px;
...@@ -203,7 +240,7 @@ ...@@ -203,7 +240,7 @@
text-align: center; text-align: center;
height:34px; height:34px;
line-height:34px; line-height:34px;
background:rgba(237,237,237,1); background:#e2e4e8;
border-radius:8px; border-radius:8px;
font-size: 12px; font-size: 12px;
font-family: "宋体"; font-family: "宋体";
...@@ -356,12 +393,12 @@ ...@@ -356,12 +393,12 @@
font-family: "宋体"!important; font-family: "宋体"!important;
} }
.borderTable thead th{ .borderTable thead th{
color:#A6C6C6; color:#000000;
padding-left: 20px; padding-left: 20px;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
font-weight:bold;
text-align: left; text-align: left;
font-family: "PingFangR";
} }
.borderTable thead tr{ .borderTable thead tr{
background:transparent!important; background:transparent!important;
...@@ -421,5 +458,22 @@ ...@@ -421,5 +458,22 @@
.borderTable tr td{ .borderTable tr td{
position: relative; position: relative;
padding:11px 0 11px 20px; padding:11px 0 11px 20px;
border:1px solid #eee; border:1px solid #E2E4EB;
}
.tableMoreUl{
background: #F6F9FB;
width: 100%;
font-size:12px;
}
.tableMoreUl li{
border-bottom:1px solid #E2E4EB;
padding:12px;
}
.tableMoreUl li span{
display: inline-block;
width:22%;
}
.tableMoreUl li:last-child{
border-bottom: none;
} }
\ No newline at end of file
src/assets/css/reset.css
View file @ 2122584f
...@@ -383,4 +383,16 @@ ...@@ -383,4 +383,16 @@
} }
.el-date-table td.available:hover{ .el-date-table td.available:hover{
color: #28CACC!important; color: #28CACC!important;
}
.upload-demo .el-upload-dragger {
background-color: #fff;
border: 1px dashed #d9d9d9;
border-radius: 6px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
width: 360px!important;
height: 180px!important;
text-align: center;
position: relative;
overflow: hidden;
} }
\ No newline at end of file
src/assets/css/vxetable.css
View file @ 2122584f
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
} }
.vxe-table .vxe-body--row .vxe-body--column{ .vxe-table .vxe-body--row .vxe-body--column{
border-bottom: 4px solid #F8FAFB!important; border-bottom: 1px solid #E2E4EB!important;
} }
.vxe-table .vxe-table--footer-wrapper, .vxe-table .vxe-table--header-wrapper{ .vxe-table .vxe-table--footer-wrapper, .vxe-table .vxe-table--header-wrapper{
border:none!important; border:none!important;
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
background: transparent!important; background: transparent!important;
} }
.vxe-table .vxe-header--column .vxe-cell{ .vxe-table .vxe-header--column .vxe-cell{
color:#A6C6C6; color:#000000;
font-family: "PingFangR";
} }
.vxe-table--header-wrapper .vxe-table--repair{ .vxe-table--header-wrapper .vxe-table--repair{
height: 0!important; height: 0!important;
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
.vxe-table .vxe-cell{ .vxe-table .vxe-cell{
padding: 0 0 0 20px; padding: 0 0 0 20px;
} }
.vxe-table .vxe-body--row:hover td{ /* .vxe-table .vxe-body--row:hover td{
border-radius:0!important; border-radius:0!important;
} }
.vxe-table .vxe-body--row:first-child td:first-child{ .vxe-table .vxe-body--row:first-child td:first-child{
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
} }
.vxe-table .vxe-body--row:last-child td:last-child{ .vxe-table .vxe-body--row:last-child td:last-child{
border-radius:0 0 20px 0; border-radius:0 0 20px 0;
} } */
.vxe-icon--menu{ .vxe-icon--menu{
color:rgba(0,210,214,1)!important; color:rgba(0,210,214,1)!important;
} }
...@@ -92,4 +93,16 @@ ...@@ -92,4 +93,16 @@
.vxe-table .vxe-table--empty-block, .vxe-table .vxe-table--empty-placeholder{ .vxe-table .vxe-table--empty-block, .vxe-table .vxe-table--empty-placeholder{
background: #fff!important; background: #fff!important;
min-height: 50px!important; min-height: 50px!important;
}
.vxe-table .vxe-body--expanded-cell{
padding:0 20px;
}
.ExpandTable .vxe-table--header-wrapper{
background: #EFF2F8!important;
}
.vxe-table .vxe-body--row.row--stripe{
background-color: #F6F9FB;
}
.vxe-table .vxe-body--column, .vxe-table .vxe-footer--column, .vxe-table .vxe-header--column{
line-height: inherit!important;
} }
\ No newline at end of file
src/assets/img/login.png
View replaced file @ 306e199d View file @ 2122584f
src/assets/img/login.png

142 KB | W: | H:

src/assets/img/login.png

170 KB | W: | H:

src/assets/img/login.png
src/assets/img/login.png
src/assets/img/login.png
src/assets/img/login.png
  • 2-up
  • Swipe
  • Onion skin
src/components/Home.vue
View file @ 2122584f
...@@ -715,7 +715,7 @@ export default { ...@@ -715,7 +715,7 @@ export default {
} }
.navDiv{ .navDiv{
position: absolute; position: absolute;
bottom: 0; bottom: 5px;
width:100%; width:100%;
text-align: center; text-align: center;
} }
...@@ -792,13 +792,13 @@ export default { ...@@ -792,13 +792,13 @@ export default {
width: 100%; width: 100%;
padding: 30px; padding: 30px;
box-sizing: border-box; box-sizing: border-box;
margin-top: 10px;
position: relative; position: relative;
} }
.banner{ .banner{
margin-top: 20px; margin-top: 20px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
background: #fff;
} }
.banner .liItem:first-child{ .banner .liItem:first-child{
margin-left: 0; margin-left: 0;
......
src/components/Materialman/Archivesmaterials.vue
View file @ 2122584f
<template> <template>
<div class="Archivesmaterials"> <div class="Archivesmaterials">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px"> <div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">物料档案</span> <span class="pageTitle">物料档案</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6"> <span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">
<span style="margin-right:5px">高级查询</span> <span style="margin-right:5px">高级查询</span>
...@@ -13,90 +13,92 @@ ...@@ -13,90 +13,92 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt=""> <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> 新增</span>
</div> </div>
<ul v-show="morequery" class="queryul"> <div class="padContent">
<li style="float:left"> <ul v-show="morequery" class="queryul">
<!-- :alwaysOpen="true" --> <li style="float:left">
<treeselect style="height:50px;width:200px;" :options="treedata" v-model="msg.CategoryId" placeholder="分类" <!-- :alwaysOpen="true" -->
:normalizer="normalizer" /> <treeselect style="height:50px;width:200px;" :options="treedata" v-model="msg.CategoryId" placeholder="分类"
</li> :normalizer="normalizer" />
<li> </li>
<el-input class="w200" size="small" v-model="msg.Name" placeholder="档案名称"></el-input> <li>
</li> <el-input class="w200" size="small" v-model="msg.Name" placeholder="档案名称"></el-input>
<li> </li>
<el-input class="w200" size="small" v-model="msg.SuppliesNum" placeholder="物料编码"></el-input> <li>
</li> <el-input class="w200" size="small" v-model="msg.SuppliesNum" placeholder="物料编码"></el-input>
<li> </li>
<el-input class="w200" size="small" v-model="msg.BrandName" placeholder="品牌"></el-input> <li>
</li> <el-input class="w200" size="small" v-model="msg.BrandName" placeholder="品牌"></el-input>
<li> </li>
<el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商名称"></el-input> <li>
</li> <el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商名称"></el-input>
</li>
</ul>
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> </ul>
<thead> <table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<th>档案编码</th> <thead>
<th>物料档案名称</th> <th>档案编码</th>
<th>分类名称</th> <th>物料档案名称</th>
<th>品牌名</th> <th>分类名称</th>
<th>成本价</th> <th>品牌名</th>
<th>供应商名称</th> <th>成本价</th>
<th>条形码号</th> <th>供应商名称</th>
<th>库存</th> <th>条形码号</th>
<th>型号</th> <th>库存</th>
<th>操作人/时间</th> <th>型号</th>
<th>备注</th> <th>操作人/时间</th>
<th>操作</th> <th>备注</th>
</thead> <th>操作</th>
<tbody> </thead>
<tr v-for="(item,index) in tableData" :key="index"> <tbody>
<td> <tr v-for="(item,index) in tableData" :key="index">
<span class="commonStyle hoverSpan1"></span> <td>
{{item.SuppliesNum}} <span class="commonStyle hoverSpan1"></span>
</td> {{item.SuppliesNum}}
<td>{{item.Name}}</td> </td>
<td>{{item.CategoryName}}</td> <td>{{item.Name}}</td>
<td>{{item.BrandName}}</td> <td>{{item.CategoryName}}</td>
<td>{{item.Money}}</td> <td>{{item.BrandName}}</td>
<td>{{item.SupplierName}}</td> <td>{{item.Money}}</td>
<td>{{item.Barcode}}</td> <td>{{item.SupplierName}}</td>
<td> <td>{{item.Barcode}}</td>
<div>预警库存：{{item.ReservedStock}}</div> <td>
<div>安全库存：{{item.SafetyStock}}</div> <div>预警库存：{{item.ReservedStock}}</div>
</td> <div>安全库存：{{item.SafetyStock}}</div>
<td>{{item.SuppliesModel}}</td> </td>
<td>{{item.SuppliesModel}}</td>
<!-- <td>
<img v-for="(subItem,index) in item.ImageList" :key="index" :src="subItem" alt=""> <!-- <td>
</td> --> <img v-for="(subItem,index) in item.ImageList" :key="index" :src="subItem" alt="">
<td> </td> -->
<p>{{item.UpdateBy}}</p> <td>
<p>{{item.UpdateDate}}</p> <p>{{item.UpdateBy}}</p>
</td> <p>{{item.UpdateDate}}</p>
<td>{{item.Remark}}</td> </td>
<td> <td>{{item.Remark}}</td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top"> <td>
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt=""> <el-tooltip class="item" effect="dark" content="编辑" placement="top">
</el-tooltip> <img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<el-tooltip class="item" effect="dark" content="删除" placement="top"> </el-tooltip>
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt=""> <el-tooltip class="item" effect="dark" content="删除" placement="top">
</el-tooltip> <img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
<span class="commonStyle hoverSpan2"></span> </el-tooltip>
</td> <span class="commonStyle hoverSpan2"></span>
</td>
</tr> </tr>
<tr v-show="tableData.length==0"> <tr v-if="tableData.length==0">
<td colspan="12" align="center">暂无数据</td> <td colspan="12" align="center">暂无数据</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<el-pagination <el-pagination
@current-change="currentChange" @current-change="currentChange"
background background
layout="prev, pager, next" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
</div>
<el-dialog <el-dialog
:title="dialogtitle" :title="dialogtitle"
...@@ -240,7 +242,7 @@ export default { ...@@ -240,7 +242,7 @@ export default {
dialogState:false, dialogState:false,
rules:{ rules:{
Name: [ Name: [
{ required: true, message: '请输入供应商名称', trigger: 'blur' } { required: true, message: '请输入档案名称', trigger: 'blur' }
], ],
BrandName:[ BrandName:[
{ required: true, message: '请输入品牌名称', trigger: 'blur' } { required: true, message: '请输入品牌名称', trigger: 'blur' }
...@@ -455,7 +457,6 @@ export default { ...@@ -455,7 +457,6 @@ export default {
display: none; display: none;
} }
.Archivesmaterials{ .Archivesmaterials{
background: #F8FAFB;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
......
src/components/Materialman/ConsumRecipients.vue
View file @ 2122584f
<template> <template>
<div class="ConsumRecipients"> <div class="ConsumRecipients">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px"> <div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">耗材领用查询</span> <span class="pageTitle">耗材领用查询</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6"> <span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">
<span style="margin-right:5px">高级查询</span> <span style="margin-right:5px">高级查询</span>
...@@ -14,80 +14,79 @@ ...@@ -14,80 +14,79 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt=""> <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> --> 新增</span> -->
</div> </div>
<ul v-show="morequery" class="queryul"> <div class="padContent">
<li> <ul v-show="morequery" class="queryul">
<el-select size="small" filterable clearable v-model="msg.SuppliesId" placeholder="物料"> <li>
<el-option <el-select size="small" filterable clearable v-model="msg.SuppliesId" placeholder="物料">
v-for="item in wulaioList" <el-option
:key="item.Id" v-for="item in wulaioList"
:label="item.Name" :key="item.Id"
:value="item.Id"> :label="item.Name"
</el-option> :value="item.Id">
</el-select> </el-option>
</li> </el-select>
<li> </li>
<el-select size="small" filterable clearable v-model="msg.EmployeeId" placeholder="使用人" :filter-method="getEmployee"> <li>
<el-option <el-select size="small" filterable clearable v-model="msg.EmployeeId" placeholder="使用人" :filter-method="getEmployee">
v-for="item in EmployeeList" <el-option
:key="item.EmployeeId" v-for="item in EmployeeList"
:label="item.EmName" :key="item.EmployeeId"
:value="item.EmployeeId"> :label="item.EmName"
</el-option> :value="item.EmployeeId">
</el-select> </el-option>
</li> </el-select>
<li> </li>
<el-date-picker <li>
v-model="dateList" <el-date-picker
type="daterange" v-model="dateList"
range-separator="至" type="daterange"
value-format="yyyy-MM-dd" range-separator="至"
start-placeholder="开始日期" value-format="yyyy-MM-dd"
end-placeholder="结束日期"> start-placeholder="开始日期"
</el-date-picker> end-placeholder="结束日期">
</li> </el-date-picker>
<li> </li>
<el-select size="small" filterable v-model="addMsg.BranchId" placeholder="公司"> <li>
<el-option <el-select size="small" filterable v-model="addMsg.BranchId" placeholder="公司">
v-for="item in BranchList" <el-option
:key="item.Id" v-for="item in BranchList"
:label="item.BName" :key="item.Id"
:value="item.Id"> :label="item.BName"
</el-option> :value="item.Id">
</el-select> </el-option>
</li> </el-select>
<li style="float:left"> </li>
<!-- :alwaysOpen="true" --> <li style="float:left">
<treeselect style="height:50px;width:200px;" :options="departmentata" v-model="addMsg.DepartmentId" placeholder="不限" <!-- :alwaysOpen="true" -->
:normalizer="normalizer"/> <treeselect style="height:50px;width:200px;" :options="departmentata" v-model="addMsg.DepartmentId" placeholder="不限"
</li> :normalizer="normalizer"/>
</ul> </li>
<!-- <vxe-grid :loading="loading" </ul>
:columns="tableColumn" <vxe-table :loading="loading" stripe style="margin-top:15px"
:toolbar="tableToolbar" :data="tableData">
:data="tableData" <vxe-table-column field="BranchName" title="公司名称"></vxe-table-column>
show-footer <vxe-table-column field="DepartmentName" title="部门名称"></vxe-table-column>
:footer-method="footerMethod" <vxe-table-column field="Number" title="领取数量"></vxe-table-column>
:edit-config="{trigger: 'click', mode: 'row', showStatus: true}"></vxe-grid> --> <vxe-table-column field="Money" title="金额"></vxe-table-column>
<!-- --> <vxe-table-column field="SuppliesName" title="耗材名称"></vxe-table-column>
<vxe-table style="margin-top:15px" <vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
:data="tableData"> <vxe-table-column field="StockOutNum" title="领取单号"></vxe-table-column>
<vxe-table-column field="BranchName" title="公司名称"></vxe-table-column> <vxe-table-column field="StockOutDate" title="领取人/领取日期">
<vxe-table-column field="DepartmentName" title="部门名称"></vxe-table-column> <template v-slot="{row}">
<vxe-table-column field="EmName" title="领取人"></vxe-table-column> <p>{{row.EmName}}</p>
<vxe-table-column field="Number" title="领取数量"></vxe-table-column> <p>{{row.StockOutDate}}</p>
<vxe-table-column field="Money" title="金额"></vxe-table-column> </template>
<vxe-table-column field="SuppliesName" title="耗材名称"></vxe-table-column> </vxe-table-column>
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column> </vxe-table>
<vxe-table-column field="StockOutNum" title="领取单号"></vxe-table-column> <el-pagination
<vxe-table-column field="StockOutDate" title="领取日期"></vxe-table-column> @current-change="currentChange"
</vxe-table> background
<el-pagination :page-size="msg.pageSize"
@current-change="currentChange" layout="prev, pager, next"
background :total="total">
:page-size="msg.pageSize" </el-pagination>
layout="prev, pager, next" </div>
:total="total">
</el-pagination>
</div> </div>
</template> </template>
...@@ -283,7 +282,6 @@ export default { ...@@ -283,7 +282,6 @@ export default {
<style > <style >
.ConsumRecipients{ .ConsumRecipients{
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB;
} }
</style> </style>
src/components/Materialman/Materialwarehouse.vue
View file @ 2122584f
<template> <template>
<div class="Materialwarehouse"> <div class="Materialwarehouse">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px"> <div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">物料仓库</span> <span class="pageTitle">物料仓库</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6"> <span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">
<span style="margin-right:5px">高级查询</span> <span style="margin-right:5px">高级查询</span>
...@@ -13,48 +13,50 @@ ...@@ -13,48 +13,50 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt=""> <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> 新增</span>
</div> </div>
<ul v-show="morequery" class="queryul"> <div class="padContent">
<li> <ul v-show="morequery" class="queryul">
<el-input class="w200" size="small" v-model="msg.Name" placeholder="仓库名称"></el-input> <li>
</li> <el-input class="w200" size="small" v-model="msg.Name" placeholder="仓库名称"></el-input>
</ul> </li>
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> </ul>
<thead> <table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<th>仓库名称</th> <thead>
<th>操作人</th> <th>仓库名称</th>
<th>操作时间</th> <th>操作人</th>
<th width="200">操作</th> <th>操作时间</th>
</thead> <th width="200">操作</th>
<tbody> </thead>
<tr v-for="(item,index) in tableData" :key="index"> <tbody>
<td> <tr v-for="(item,index) in tableData" :key="index">
<span class="commonStyle hoverSpan1"></span> <td>
{{item.Name}} <span class="commonStyle hoverSpan1"></span>
</td> {{item.Name}}
<td>{{item.UpdateBy}}</td> </td>
<td>{{item.UpdateDate}}</td> <td>{{item.UpdateBy}}</td>
<td> <td>{{item.UpdateDate}}</td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top"> <td>
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt=""> <el-tooltip class="item" effect="dark" content="编辑" placement="top">
</el-tooltip> <img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<el-tooltip class="item" effect="dark" content="删除" placement="top"> </el-tooltip>
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt=""> <el-tooltip class="item" effect="dark" content="删除" placement="top">
</el-tooltip> <img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
<span class="commonStyle hoverSpan2"></span> </el-tooltip>
</td> <span class="commonStyle hoverSpan2"></span>
</tr> </td>
<tr v-show="tableData.length==0"> </tr>
<td colspan="12" align="center">暂无数据</td> <tr v-if="tableData.length==0">
</tr> <td colspan="12" align="center">暂无数据</td>
</tbody> </tr>
</table> </tbody>
<el-pagination </table>
@current-change="currentChange" <el-pagination
background @current-change="currentChange"
layout="prev, pager, next" background
:total="total"> layout="prev, pager, next"
</el-pagination> :total="total">
</el-pagination>
</div>
<el-dialog <el-dialog
:title="dialogtitle" :title="dialogtitle"
top="0" top="0"
...@@ -99,7 +101,7 @@ export default { ...@@ -99,7 +101,7 @@ export default {
dialogState:false, dialogState:false,
rules:{ rules:{
Name: [ Name: [
{ required: true, message: '请输入供应商名称', trigger: 'blur' } { required: true, message: '请输入仓库名称', trigger: 'blur' }
] ]
}, },
} }
...@@ -209,7 +211,6 @@ export default { ...@@ -209,7 +211,6 @@ export default {
display: none; display: none;
} }
.Materialwarehouse{ .Materialwarehouse{
background: #F8FAFB;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
......
src/components/Materialman/SpotQuery.vue
View file @ 2122584f
<template> <template>
<div class="spotquery"> <div class="spotquery">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px"> <div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">现存量查询</span> <span class="pageTitle">现存量查询</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6"> <span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">
<span style="margin-right:5px">高级查询</span> <span style="margin-right:5px">高级查询</span>
...@@ -15,62 +15,67 @@ ...@@ -15,62 +15,67 @@
<span @click="Export('GetInventoryPageListToExcel','库存')" style="margin-left:20px" class="addSpan">导出</span> <span @click="Export('GetInventoryPageListToExcel','库存')" style="margin-left:20px" class="addSpan">导出</span>
</div> </div>
<ul v-show="morequery" class="queryul"> <div class="padContent">
<li> <ul v-show="morequery" class="queryul">
<el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库"> <li>
<el-option <el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库">
v-for="item in getWareHouseList" <el-option
:key="item.Id" v-for="item in getWareHouseList"
:label="item.Name" :key="item.Id"
:value="item.Id"> :label="item.Name"
</el-option> :value="item.Id">
</el-select> </el-option>
</li> </el-select>
</li>
<li>
<el-select size="small" filterable clearable v-model="msg.SuppliesId" placeholder="物料"> <li>
<el-option <el-select size="small" filterable clearable v-model="msg.SuppliesId" placeholder="物料">
v-for="item in wulaioList" <el-option
:key="item.Id" v-for="item in wulaioList"
:label="item.Name" :key="item.Id"
:value="item.Id"> :label="item.Name"
</el-option> :value="item.Id">
</el-select> </el-option>
</li> </el-select>
</ul> </li>
<vxe-table style="margin-top:15px" :loading="loading" </ul>
:data="tableData"> <vxe-table stripe style="margin-top:15px" :loading="loading"
<vxe-table-column field="SuppliesNum" title="耗材编码"></vxe-table-column> :data="tableData">
<vxe-table-column field="SuppliesName" title="耗材名称"></vxe-table-column> <vxe-table-column field="SuppliesNum" title="耗材编码"></vxe-table-column>
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column> <vxe-table-column field="SuppliesName" title="耗材名称"></vxe-table-column>
<vxe-table-column field="SuppliesModel" title="耗材型号"></vxe-table-column> <vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
<vxe-table-column field="WareHouseName" 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="WareHouseName" title="仓库名称"></vxe-table-column>
<vxe-table-column field="Units" title="单位"></vxe-table-column> <vxe-table-column field="BrandName" title="品牌"></vxe-table-column>
<vxe-table-column field="SafetyStock" title="安全库存"></vxe-table-column> <vxe-table-column field="Units" title="单位"></vxe-table-column>
<vxe-table-column field="ReservedStock" title="预留库存"></vxe-table-column> <vxe-table-column field="SafetyStock" title="安全库存"></vxe-table-column>
<vxe-table-column field="UnitPrice" title="单价"></vxe-table-column> <vxe-table-column field="ReservedStock" title="预留库存"></vxe-table-column>
<vxe-table-column field="Number" title="库存数量"> <vxe-table-column field="UnitPrice" title="单价"></vxe-table-column>
<template v-slot="{ row }"> <vxe-table-column field="Number" title="库存数量">
<span class="bold" v-if="row.Number < row.SafetyStock" style="color:red">{{row.Number}}</span> <template v-slot="{ row }">
<span v-else>{{row.Number}}</span> <span class="bold" v-if="row.Number < row.SafetyStock" style="color:red">{{row.Number}}</span>
</template> <span v-else>{{row.Number}}</span>
</vxe-table-column> </template>
<vxe-table-column field="address" title="操作"> </vxe-table-column>
<template v-slot="{ row }"> <vxe-table-column field="address" title="操作">
<el-tooltip class="item" effect="dark" content="日志" placement="top"> <template v-slot="{ row }">
<img @click="Operation(row)" style="width:24px;height:24px" src="../../assets/img/czrz.png" alt=""> <el-tooltip class="item" effect="dark" content="日志" placement="top">
</el-tooltip> <img @click="Operation(row)" style="width:24px;height:24px" src="../../assets/img/czrz.png" alt="">
</template> </el-tooltip>
</vxe-table-column> </template>
</vxe-table> </vxe-table-column>
<el-pagination </vxe-table>
@current-change="currentChange" <el-pagination
background @current-change="currentChange"
:page-size="msg.pageSize" background
layout="prev, pager, next" :page-size="msg.pageSize"
:total="total"> layout="prev, pager, next"
</el-pagination> :total="total">
</el-pagination>
</div>
<!-- 操作日志 --> <!-- 操作日志 -->
<el-dialog <el-dialog
title="操作日志" title="操作日志"
...@@ -275,6 +280,5 @@ export default { ...@@ -275,6 +280,5 @@ export default {
<style scoped> <style scoped>
.spotquery{ .spotquery{
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB;
} }
</style> </style>
src/components/Materialman/chukudan.vue
View file @ 2122584f
This diff is collapsed.
src/components/Materialman/rukudan.vue
View file @ 2122584f
This diff is collapsed.
src/components/Systemman/AssetsClassification.vue
View file @ 2122584f
<template> <template>
<div class="Assetscation"> <div class="Assetscation">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px;box-sizing:border-box;margin:0 30px;"> <div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px;box-sizing:border-box;">
<span class="pageTitle">资产分类</span> <span class="pageTitle">资产分类</span>
<span @click="Add" style="margin-left:20px" class="addSpan"> <span @click="Add" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt=""> <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> 新增</span>
</div> </div>
<div style="margin-top:10px;position:relative"> <div class="padContent" style="margin-top:10px;position:relative">
<div class="TreeDiv overflowY"> <div class="TreeDiv overflowY">
<el-tree <el-tree
@node-click="Nodeclick" @node-click="Nodeclick"
...@@ -27,44 +27,29 @@ ...@@ -27,44 +27,29 @@
</div> </div>
<div class="rightTable"> <div class="rightTable">
<!-- :style='{"height":tableHeight+"px"}' --> <!-- :style='{"height":tableHeight+"px"}' -->
<div class="overflowY"> <vxe-table stripe style="margin-top:15px" :loading="loading"
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> :data="dataList">
<thead> <vxe-table-column field="Id" title="ID"></vxe-table-column>
<tr> <vxe-table-column field="Name" title="名称"></vxe-table-column>
<th>ID</th> <vxe-table-column field="ParentName" title="父级名称"></vxe-table-column>
<th>名称</th> <vxe-table-column field="Tier" title="层级"></vxe-table-column>
<th>父级名称</th> <vxe-table-column field="StockOutDate" title="操作人/时间">
<th>层级</th> <template v-slot="{row}">
<th>操作人/时间</th> <p>{{row.UpdateBy}}</p>
<th>操作</th> <p>{{row.UpdateDate}}</p>
</tr> </template>
</vxe-table-column>
</thead> <vxe-table-column field="StockOutDate" title="操作">
<tbody> <template v-slot="{row}">
<tr v-for="(item,index) in dataList" :key="index"> <el-tooltip class="item" effect="dark" content="编辑" placement="top">
<td> {{item.Id}}</td> <img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<td>{{item.Name}}</td> </el-tooltip>
<td>{{item.ParentName}}</td> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<td>{{item.Tier}}</td> <img @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
<td> </el-tooltip>
<p>{{item.UpdateBy}}</p> </template>
<p>{{item.UpdateDate}}</p> </vxe-table-column>
</td> </vxe-table>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" 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(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="7" align="center">暂无数据</td>
</tr>
</tbody>
</table>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'> layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination> </el-pagination>
...@@ -395,7 +380,7 @@ export default { ...@@ -395,7 +380,7 @@ export default {
.Assetscation .TreeDiv{ .Assetscation .TreeDiv{
width: 220px; width: 220px;
position: absolute; position: absolute;
left: 0px; left: 30px;
z-index: 1; z-index: 1;
height:100%; height:100%;
padding: 20px 10px; padding: 20px 10px;
......
src/components/Systemman/MaterialClassification.vue
View file @ 2122584f
<template> <template>
<div class="Assetscation"> <div class="Assetscation">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px;box-sizing:border-box;margin:0 30px;"> <div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px;box-sizing:border-box;">
<span class="pageTitle">耗材分类</span> <span class="pageTitle">耗材分类</span>
<span @click="Add" style="margin-left:20px" class="addSpan"> <span @click="Add" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt=""> <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> 新增</span>
</div> </div>
<div style="margin-top:10px;position:relative"> <div class="padContent" style="margin-top:10px;position:relative">
<div class="TreeDiv overflowY"> <div class="TreeDiv overflowY">
<el-tree <el-tree
@node-click="Nodeclick" @node-click="Nodeclick"
...@@ -27,45 +27,29 @@ ...@@ -27,45 +27,29 @@
</div> </div>
<div class="rightTable"> <div class="rightTable">
<!-- :style='{"height":tableHeight+"px"}' --> <!-- :style='{"height":tableHeight+"px"}' -->
<div class="overflowY" > <vxe-table stripe style="margin-top:15px" :loading="loading"
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> :data="dataList">
<thead> <vxe-table-column field="Id" title="ID"></vxe-table-column>
<tr> <vxe-table-column field="Name" title="名称"></vxe-table-column>
<th>ID</th> <vxe-table-column field="ParentName" title="父级名称"></vxe-table-column>
<th>名称</th> <vxe-table-column field="Tier" title="层级"></vxe-table-column>
<th>父级名称</th> <vxe-table-column field="StockOutDate" title="操作人/时间">
<th>层级</th> <template v-slot="{row}">
<th>操作人/时间</th> <p>{{row.UpdateBy}}</p>
<th>操作</th> <p>{{row.UpdateDate}}</p>
</tr> </template>
</vxe-table-column>
</thead> <vxe-table-column field="StockOutDate" title="操作">
<tbody> <template v-slot="{row}">
<tr v-for="(item,index) in dataList" :key="index"> <el-tooltip class="item" effect="dark" content="编辑" placement="top">
<td> {{item.Id}}</td> <img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<td>{{item.Name}}</td> </el-tooltip>
<td>{{item.ParentName}}</td> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<td>{{item.Tier}}</td> <img @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
<td> </el-tooltip>
<p>{{item.UpdateBy}}</p> </template>
<p>{{item.UpdateDate}}</p> </vxe-table-column>
</td> </vxe-table>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" 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(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="7" align="center">暂无数据</td>
</tr>
</tbody>
</table>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'> layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination> </el-pagination>
...@@ -394,7 +378,7 @@ export default { ...@@ -394,7 +378,7 @@ export default {
.Assetscation .TreeDiv{ .Assetscation .TreeDiv{
width: 220px; width: 220px;
position: absolute; position: absolute;
left: 0px; left:30px;
z-index: 1; z-index: 1;
height:100%; height:100%;
padding: 20px 10px; padding: 20px 10px;
......
src/components/Systemman/Supplierman.vue
View file @ 2122584f
<template> <template>
<div class="Supplierman"> <div class="Supplierman">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px"> <div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">供应商管理</span> <span class="pageTitle">供应商管理</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6"> <span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">
<span style="margin-right:5px">高级查询</span> <span style="margin-right:5px">高级查询</span>
...@@ -13,83 +13,50 @@ ...@@ -13,83 +13,50 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt=""> <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> 新增</span>
</div> </div>
<ul v-show="morequery" class="queryul"> <div class="padContent">
<li> <ul v-show="morequery" class="queryul">
<el-input class="w200" size="small" v-model="msg.Name" placeholder="供应商名称"></el-input> <li>
</li> <el-input class="w200" size="small" v-model="msg.Name" placeholder="供应商名称"></el-input>
<li> </li>
<el-input class="w200" size="small" v-model="msg.Contact" placeholder="联系人"></el-input> <li>
</li> <el-input class="w200" size="small" v-model="msg.Contact" placeholder="联系人"></el-input>
<li> </li>
<el-input class="w200" size="small" v-model="msg.Mobile" placeholder="联系电话"></el-input> <li>
</li> <el-input class="w200" size="small" v-model="msg.Mobile" placeholder="联系电话"></el-input>
</ul> </li>
<vxe-table style="margin-top:15px" :loading="loading" </ul>
:data="tableData"> <vxe-table stripe style="margin-top:15px" :loading="loading"
<vxe-table-column field="Name" title="供应商名称"></vxe-table-column> :data="tableData">
<vxe-table-column field="Contact" title="联系人"></vxe-table-column> <vxe-table-column field="Name" title="供应商名称"></vxe-table-column>
<vxe-table-column field="Mobile" title="联系电话"></vxe-table-column> <vxe-table-column field="Contact" title="联系人"></vxe-table-column>
<vxe-table-column field="UpdateBy" title="操作人/时间"> <vxe-table-column field="Mobile" title="联系电话"></vxe-table-column>
<template v-slot="{ row }"> <vxe-table-column field="UpdateBy" title="操作人/时间">
<p>{{row.UpdateBy}}</p> <template v-slot="{ row }">
<p>{{row.UpdateDate}}</p> <p>{{row.UpdateBy}}</p>
</template> <p>{{row.UpdateDate}}</p>
</template>
</vxe-table-column>
<vxe-table-column field="address" title="操作"> </vxe-table-column>
<template v-slot="{ row }"> <vxe-table-column field="address" title="操作">
<el-tooltip class="item" effect="dark" content="编辑" placement="top"> <template v-slot="{ row }">
<img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt=""> <el-tooltip class="item" effect="dark" content="编辑" placement="top">
</el-tooltip> <img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<el-tooltip class="item" effect="dark" content="删除" placement="top"> </el-tooltip>
<img @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt=""> <el-tooltip class="item" effect="dark" content="删除" placement="top">
</el-tooltip> <img @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</template> </el-tooltip>
</vxe-table-column> </template>
</vxe-table> </vxe-table-column>
<!-- <table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> </vxe-table>
<thead> <el-pagination
<th>供应商名称</th> @current-change="currentChange"
<th>联系人</th> background
<th>联系电话</th> :page-size="msg.pageSize"
<th>操作人</th> layout="prev, pager, next"
<th>操作时间</th> :total="total">
<th>操作</th> </el-pagination>
</thead> </div>
<tbody>
<tr v-for="(item,index) in tableData" :key="index">
<td>
<span class="commonStyle hoverSpan1"></span>
{{item.Name}}
</td>
<td>{{item.Contact}}</td>
<td>{{item.Mobile}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" 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(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
<span class="commonStyle hoverSpan2"></span>
</td>
</tr>
<tr v-show="tableData.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</tbody>
</table> -->
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total">
</el-pagination>
<el-dialog <el-dialog
:title="dialogtitle" :title="dialogtitle"
...@@ -258,6 +225,5 @@ export default { ...@@ -258,6 +225,5 @@ export default {
<style scoped> <style scoped>
.Supplierman{ .Supplierman{
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB;
} }
</style> </style>
src/components/approval/SignMan.vue
View file @ 2122584f
This diff is collapsed.
src/components/approval/approvalDetails.vue
View file @ 2122584f
<template> <template>
<div class="approvalDetails" v-loading="pageLoad"> <div class="approvalDetails padContent" v-loading="pageLoad">
<div style="border-bottom:1px solid #E2E4EB;padding-bottom:10px"> <div style="border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle" style="float:inherit">详情</span> <span class="pageTitle" style="float:inherit">详情</span>
<span @click="backTo" class="backTo" style="">返回</span> <span @click="backTo" class="backTo" style="">返回</span>
......
src/components/approval/approvalMan.vue
View file @ 2122584f
This diff is collapsed.
src/components/approval/approvalset.vue
View file @ 2122584f
<template> <template>
<div class="spotquery"> <div class="spotquery">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px"> <div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">流程设置</span> <span class="pageTitle">流程设置</span>
<span class="ChangeTable"> <span class="ChangeTable">
<span @click="showTable=1" :class="showTable==1?'spanActive':''">审批</span> <span @click="showTable=1" :class="showTable==1?'spanActive':''">审批</span>
<span @click="showTable=2" :class="showTable==2?'spanActive':''">签字</span> <span @click="showTable=2" :class="showTable==2?'spanActive':''">签字</span>
</span> </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="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> </div>
<vxe-table :loading="loading" v-if="showTable==1" style="margin-top:15px" <div class="padContent">
:data="AuditList"> <vxe-table stripe :loading="loading" v-if="showTable==1" style="margin-top:15px"
<vxe-table-column field="Type" title="ID"></vxe-table-column> :data="AuditList">
<vxe-table-column field="Name" title="名称"></vxe-table-column> <vxe-table-column field="Type" title="ID"></vxe-table-column>
<vxe-table-column title="是否启用"> <vxe-table-column field="Name" title="名称"></vxe-table-column>
<template v-slot="{ row }"> <vxe-table-column title="是否启用">
<span v-if="row.Enabled==1">是</span> <template v-slot="{ row }">
<span v-if="row.Enabled==2">否</span> <span v-if="row.Enabled==1">是</span>
</template> <span v-if="row.Enabled==2">否</span>
</vxe-table-column> </template>
<vxe-table-column field="address" title="操作"> </vxe-table-column>
<template v-slot="{ row }"> <vxe-table-column field="address" title="操作">
<el-tooltip class="item" effect="dark" content="启用" placement="top"> <template v-slot="{ row }">
<img v-show="row.Enabled==2" @click="ChangeAble(row,1)" style="width:24px;height:24px" src="../../assets/img/qiyong.png" alt=""> <el-tooltip class="item" effect="dark" content="启用" placement="top">
</el-tooltip> <img v-show="row.Enabled==2" @click="ChangeAble(row,1)" style="width:24px;height:24px" src="../../assets/img/qiyong.png" alt="">
<el-tooltip class="item" effect="dark" content="禁用" placement="top"> </el-tooltip>
<img v-show="row.Enabled==1" @click="ChangeAble(row,2)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt=""> <el-tooltip class="item" effect="dark" content="禁用" placement="top">
</el-tooltip> <img v-show="row.Enabled==1" @click="ChangeAble(row,2)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt="">
</template> </el-tooltip>
</vxe-table-column> </template>
</vxe-table> </vxe-table-column>
<vxe-table :loading="loading" v-if="showTable==2" style="margin-top:15px" </vxe-table>
:data="SignList"> <vxe-table stripe :loading="loading" v-if="showTable==2" style="margin-top:15px"
<vxe-table-column field="Type" title="ID"></vxe-table-column> :data="SignList">
<vxe-table-column field="Name" title="名称"></vxe-table-column> <vxe-table-column field="Type" title="ID"></vxe-table-column>
<vxe-table-column title="是否启用"> <vxe-table-column field="Name" title="名称"></vxe-table-column>
<template v-slot="{ row }"> <vxe-table-column title="是否启用">
<span v-if="row.Enabled==1">是</span> <template v-slot="{ row }">
<span v-if="row.Enabled==2">否</span> <span v-if="row.Enabled==1">是</span>
</template> <span v-if="row.Enabled==2">否</span>
</vxe-table-column> </template>
<vxe-table-column field="address" title="操作"> </vxe-table-column>
<template v-slot="{ row }"> <vxe-table-column field="address" title="操作">
<el-tooltip class="item" effect="dark" content="启用" placement="top"> <template v-slot="{ row }">
<img v-show="row.Enabled==2" @click="ChangeAble(row,1)" style="width:24px;height:24px" src="../../assets/img/qiyong.png" alt=""> <el-tooltip class="item" effect="dark" content="启用" placement="top">
</el-tooltip> <img v-show="row.Enabled==2" @click="ChangeAble(row,1)" style="width:24px;height:24px" src="../../assets/img/qiyong.png" alt="">
<el-tooltip class="item" effect="dark" content="禁用" placement="top"> </el-tooltip>
<img v-show="row.Enabled==1" @click="ChangeAble(row,2)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt=""> <el-tooltip class="item" effect="dark" content="禁用" placement="top">
</el-tooltip> <img v-show="row.Enabled==1" @click="ChangeAble(row,2)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt="">
</template> </el-tooltip>
</vxe-table-column> </template>
</vxe-table> </vxe-table-column>
</vxe-table>
</div>
<!-- <el-pagination <!-- <el-pagination
@current-change="currentChange" @current-change="currentChange"
background background
...@@ -200,7 +193,6 @@ export default { ...@@ -200,7 +193,6 @@ export default {
<style scoped> <style scoped>
.spotquery{ .spotquery{
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB;
} }
</style> </style>
src/components/assetsman/LendReturn.vue
View file @ 2122584f
This diff is collapsed.
src/components/assetsman/PaiTui.vue
View file @ 2122584f
This diff is collapsed.
src/components/assetsman/assetsList.vue
View file @ 2122584f
This diff is collapsed.
src/components/global/Nav.vue
View file @ 2122584f
...@@ -3,95 +3,60 @@ ...@@ -3,95 +3,60 @@
<div style="text-align:center;padding-top:30px"> <div style="text-align:center;padding-top:30px">
<img style="width:42px;height:42px;" src="../../assets/img/logo.png" alt=""> <img style="width:42px;height:42px;" src="../../assets/img/logo.png" alt="">
</div> </div>
<div style="margin-top:60px"> <div class="BigmenuDiv" :style='{"height":menuheight+"px"}'>
<el-menu <el-menu
:unique-opened="true" :unique-opened="true"
:default-active="defaulActive" :default-active="defaulActive"
class="el-menu-vertical-demo"> class="el-menu-vertical-demo">
<el-menu-item index="0" route="/home"> <el-menu-item index="0" route="/home">
<div @click="goHome" class="menuDiv"> <div @click="goHome" class="menuDiv">
<i class="iconfont icon-shouye"></i> <i class="iconfont icon-shouye"></i>
<span slot="title">首页</span> <span slot="title">首页</span>
</div>
</el-menu-item>
<!-- <el-submenu index="1">
<template slot="title">
<div class="menuDiv">
<img v-if="defaulActive!=1" class="icon" src="../../assets/img/zc1.png" alt="">
<img v-if="defaulActive==1" class="icon" src="../../assets/img/zc.png" alt="">
<span>资产管理</span>
</div> </div>
</template> </el-menu-item>
<el-menu-item-group class="itemgroup"> <el-submenu :index="String(index+1)" v-for="(item,index) in menuList" :key="index">
<el-menu-item index="1-1"><span>资产列表</span></el-menu-item> <template slot="title">
<el-menu-item index="1-2"><span>派发&退库</span></el-menu-item> <div class="menuDiv">
</el-menu-item-group> <i :class="[fontPub,idonfontList[index]]" ></i>
<span slot="title">{{item.MenuName}}</span>
</div>
</template>
<el-menu-item-group class="itemgroup">
<!-- :index="String(index+1)+'-'+String(childIndex+1)" -->
<el-menu-item @click="goUrl(child)" v-for="(child,childIndex) in item.ChildMenu" :key="childIndex" :index="child.MenuUrl"><span>{{child.MenuName}}</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
</el-menu>
</div>
<!-- 登录人 -->
<div class="HeadDiv" style="padding-top:20px">
<div class="personDiv">
<el-popover
placement="bottom"
trigger="click">
<ul>
<li style="cursor: pointer;">
<span class="f14"><span style="color:#BEBEBE">Hello</span>，{{zcuserInfo.emName}}</span>
</li>
<li @click="LoginOut" style="cursor: pointer;margin-top:12px">
<i style="color:#FFA475" class="iconfont icon-tuichudenglu"></i>
<span style="margin-left:6px">退出登录</span>
</li>
</ul>
<span slot="reference" style="display: inline-flex;align-items: center;cursor: pointer;">
<img v-if="zcuserInfo.Icon && zcuserInfo.Icon!='' " :src="zcuserInfo.Icon" :onerror="defaultHeadImg" style="width:44px;height:44px;margin-left:45px;border-radius:50%" alt="">
<img v-else src="../../assets/img/defaultperson.png" style="width:44px;height:44px;margin-left:45px;border-radius:50%" alt="">
</span>
</el-popover>
<img style="width:18px;height:22px;margin-left:30px;" src="../../assets/img/news.png" alt="">
</el-submenu>
<el-submenu index="2">
<template slot="title">
<div class="menuDiv">
<img v-if="defaulActive!=2" class="icon" src="../../assets/img/hc.png" alt="">
<img v-if="defaulActive==2" class="icon" src="../../assets/img/hc1.png" alt="">
<span slot="title">耗材管理</span>
</div>
</template>
<el-menu-item-group class="itemgroup">
<el-menu-item index="2-1"><span>物料仓库</span></el-menu-item>
<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>
<el-submenu index="3">
<template slot="title">
<div class="menuDiv">
<img v-if="defaulActive=='3-1' || defaulActive=='3-2' || defaulActive=='3-3'" class="icon icon1" src="../../assets/img/xt1.png" alt="">
<img v-else class="icon" src="../../assets/img/xt.png" alt="">
<span slot="title">系统管理</span>
</div>
</template>
<el-menu-item-group class="itemgroup">
<el-menu-item index="3-1"><span>资产分类</span></el-menu-item>
<el-menu-item index="3-2"><span>耗材分类</span></el-menu-item>
<el-menu-item index="3-3"><span>供应商管理</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
<el-submenu index="4"> </div>
<template slot="title">
<div class="menuDiv">
<img v-if="defaulActive!='4'" class="icon" src="../../assets/img/sp.png" alt="">
<img v-if="defaulActive=='4'" class="icon" src="../../assets/img/sp1.png" alt="">
<span slot="title">审批中心</span>
</div>
</template>
<el-menu-item-group class="itemgroup">
<el-menu-item index="4-1"><span>流程设置</span></el-menu-item>
<el-menu-item index="4-2"><span>审批管理</span></el-menu-item>
</el-menu-item-group>
</el-submenu> -->
<el-submenu :index="String(index+1)" v-for="(item,index) in menuList" :key="index">
<template slot="title">
<div class="menuDiv">
<i :class="[fontPub,idonfontList[index]]" ></i>
<span slot="title">{{item.MenuName}}</span>
</div>
</template>
<el-menu-item-group class="itemgroup">
<!-- :index="String(index+1)+'-'+String(childIndex+1)" -->
<el-menu-item @click="goUrl(child)" v-for="(child,childIndex) in item.ChildMenu" :key="childIndex" :index="child.MenuUrl"><span>{{child.MenuName}}</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
</el-menu>
</div> </div>
</div> </div>
</template> </template>
...@@ -124,15 +89,22 @@ export default { ...@@ -124,15 +89,22 @@ export default {
}, },
menuList:[], menuList:[],
zcuserInfo:{},
defaultHeadImg:
'this.src="' + require("../../assets/img/defaultperson.png") + '"',
menuheight:0,
} }
}, },
created(){ created(){
if(!this.getLocalStorage()){ this.menuheight=document.body.clientHeight-220;
this.$router.push({path: 'login'}) console.log("this.menuheight",this.menuheight)
return; if(!this.getLocalStorage()){
} this.$router.push({path: 'login'})
return;
this.getMenu(); }
let zcuserInfo = this.getLocalStorage();
this.zcuserInfo=zcuserInfo;
this.getMenu();
}, },
watch:{ watch:{
...@@ -141,6 +113,10 @@ export default { ...@@ -141,6 +113,10 @@ export default {
}, },
}, },
methods:{ methods:{
LoginOut(){
localStorage.removeItem("zcuserInfo");
location.href='/'
},
goHome(){ goHome(){
this.$router.push({path: '/Home'}) this.$router.push({path: '/Home'})
}, },
...@@ -156,6 +132,30 @@ export default { ...@@ -156,6 +132,30 @@ export default {
</script> </script>
<style> <style>
.BigmenuDiv{
margin-top:60px;
margin-bottom:80px;
overflow: scroll;
}
.HeadNav {
position: relative;
height: 100%;
}
.HeadNav .HeadDiv .personDiv{
display: inline-flex;
align-items: center;
padding-right: 30px;
}
.HeadNav .HeadDiv{
position: absolute;
width: 100%;
bottom: 0;
z-index: 2;
background: #fff;
padding:10px 0;
border-top:1px solid #E2E4E8;
}
.HeadNav .is-active .el-submenu__title i{ .HeadNav .is-active .el-submenu__title i{
color:#fff!important; color:#fff!important;
} }
...@@ -223,7 +223,7 @@ export default { ...@@ -223,7 +223,7 @@ export default {
} }
.HeadNav .itemgroup .el-menu-item{ .HeadNav .itemgroup .el-menu-item{
margin-bottom: 5px!important; margin-bottom: 5px!important;
color: rgba(164, 188, 188, 1); color: #83A4A5;
} }
.HeadNav .itemgroup .el-menu-item span{ .HeadNav .itemgroup .el-menu-item span{
padding-left: 40px; padding-left: 40px;
......
src/components/global/index.vue
View file @ 2122584f
...@@ -5,34 +5,7 @@ ...@@ -5,34 +5,7 @@
</div> </div>
<div class="appContent"> <div class="appContent">
<!-- 头部 -->
<div class="HeadDiv" style="padding-top:20px">
<!-- <div class="searchDiv">
<img style="width:20px;height:20px" src="../../assets/img/search.png" alt="">
<input type="text" placeholder="请输入关键词搜索">
</div> -->
<div class="personDiv">
<img style="width:18px;height:22px" src="../../assets/img/news.png" alt="">
<el-popover
placement="bottom"
trigger="click">
<ul>
<li @click="LoginOut" style="cursor: pointer;">
<i style="color:#FFA475" class="iconfont icon-tuichudenglu"></i>
<span style="margin-left:6px">退出登录</span>
</li>
</ul>
<span slot="reference" style="display: inline-flex;align-items: center;cursor: pointer;">
<span style="margin-left:30px" class="f14"><span style="color:#BEBEBE">Hello</span>,{{zcuserInfo.emName}}</span>
<img v-if="zcuserInfo.Icon && zcuserInfo.Icon!='' " :src="zcuserInfo.Icon" :onerror="defaultHeadImg" style="width:44px;height:44px;margin-left:29px;border-radius:50%" alt="">
<img v-else src="../../assets/img/defaultperson.png" style="width:44px;height:44px;margin-left:29px;border-radius:50%" alt="">
</span>
</el-popover>
</div>
</div>
<div class="routerContent"> <div class="routerContent">
<div :style='{"min-height":minHeight+"px"}'> <div :style='{"min-height":minHeight+"px"}'>
<router-view/> <router-view/>
...@@ -56,13 +29,11 @@ export default { ...@@ -56,13 +29,11 @@ export default {
data(){ data(){
return{ return{
minHeight:0, minHeight:0,
zcuserInfo:{},
defaultHeadImg:
'this.src="' + require("../../assets/img/defaultperson.png") + '"',
} }
}, },
created(){ created(){
this.minHeight=document.body.clientHeight-90; this.minHeight=document.body.clientHeight;
if(!this.getLocalStorage()){ if(!this.getLocalStorage()){
this.$router.push({path: 'login'}) this.$router.push({path: 'login'})
return; return;
...@@ -74,10 +45,7 @@ export default { ...@@ -74,10 +45,7 @@ export default {
} }
}, },
methods:{ methods:{
LoginOut(){
localStorage.removeItem("zcuserInfo");
location.href='/'
},
}, },
} }
</script> </script>
...@@ -85,15 +53,14 @@ export default { ...@@ -85,15 +53,14 @@ export default {
<style> <style>
.appContent .routerContent{ .appContent .routerContent{
padding-top: 90px;
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB; background: #EFF2F8;
} }
.appContent .routerContent>div{ .appContent .routerContent>div{
position: relative; position: relative;
padding:20px 30px 10px 30px; /* padding:20px 30px 10px 30px; */
box-sizing: border-box; box-sizing: border-box;
} }
.nav{ .nav{
...@@ -104,17 +71,10 @@ export default { ...@@ -104,17 +71,10 @@ export default {
height: 100%; height: 100%;
z-index: 1; z-index: 1;
} }
.appContent .HeadDiv{
position: fixed;
width: calc(100% - 214px);
top: 0;
z-index: 2;
background: #fff;
padding:20px 0;
}
.appContent{ .appContent{
width: 100%; width: 100%;
padding-left: 214px; padding-left: 204px;
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
} }
...@@ -157,11 +117,6 @@ export default { ...@@ -157,11 +117,6 @@ export default {
.searchDiv input::placeholder { /* 大部分现代浏览器 */ .searchDiv input::placeholder { /* 大部分现代浏览器 */
color:rgba(190, 193, 198, 1) color:rgba(190, 193, 198, 1)
} }
.personDiv{
float: right;
display: inline-flex;
align-items: center;
padding-right: 30px;
}
</style> </style>
src/plugins/index.js
View file @ 2122584f
...@@ -26,11 +26,14 @@ export default { ...@@ -26,11 +26,14 @@ export default {
var obj = { var obj = {
//主地址 //主地址
DomainUrl: domainUrl, DomainUrl: domainUrl,
//上传文件URL
UploadFileUrl: domainUrl + '/api/File/post',
LocalTemplateFileDownLoadUrl: domainUrl,
//常用提交数据URL //常用提交数据URL
PostUrl: domainUrl + "/api/common/post", PostUrl: domainUrl + "/api/common/post",
// javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000", // javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
javaUrl: locationName.indexOf('zcyx') == -1 ? "http://192.168.2.17:8087" : locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://property.oytour.com" : "http://192.168.2.17:8087", javaUrl: locationName.indexOf('zcyx') == -1 ? "http://192.168.2.17:8087" : locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://property.oytour.com" : "http://192.168.2.17:8087",
// javaUrl: "http://192.168.2.17:8087", // javaUrl: "http://192.168.2.17:8087",
// javaUrl: "http://property.oytour.com", // javaUrl: "http://property.oytour.com",
ViittoFileUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130', ViittoFileUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130',
......
src/router/config.js
View file @ 2122584f
...@@ -35,6 +35,8 @@ export default { ...@@ -35,6 +35,8 @@ export default {
name: 'AssetsClassification', name: 'AssetsClassification',
component: resolve => require(['@/components/Systemman/AssetsClassification'], resolve), component: resolve => require(['@/components/Systemman/AssetsClassification'], resolve),
}, },
// 耗材分类 // 耗材分类
{ {
path: '/MaterialClassification', path: '/MaterialClassification',
...@@ -72,6 +74,12 @@ export default { ...@@ -72,6 +74,12 @@ export default {
name: 'allocatingMan', name: 'allocatingMan',
component: resolve => require(['@/components/assetsman/allocatingMan'], resolve), component: resolve => require(['@/components/assetsman/allocatingMan'], resolve),
}, },
// 批量导入
{
path: '/BulkImport',
name: 'BulkImport',
component: resolve => require(['@/components/assetsman/BulkImport'], resolve),
},
// 处置管理 // 处置管理
{ {
path: '/disposalMan', path: '/disposalMan',
......
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