Skip to content

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

update

parent 54a7ff56
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1013 additions and 403 deletions
src/assets/css/common.css
View file @ 85240dac
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
font-family: "宋体"; font-family: "宋体";
box-sizing: border-box;
} }
.pageTitle{ .pageTitle{
...@@ -47,6 +48,22 @@ ...@@ -47,6 +48,22 @@
.roatImg{ .roatImg{
transform: rotate(180deg); transform: rotate(180deg);
} }
/* chexkbox */
.myTable input[type="checkbox"]{
width:15px;height:15px;
display: inline-block;text-align: center;vertical-align: middle; line-height: 15px;position: relative;
}
.myTable input[type="checkbox"]::before{
content: "";position: absolute;top: 0;left: 0;
background: #fff;width: 100%;height: 100%;border: 1px solid #B9ECED
}
.myTable input[type="checkbox"]:checked::before{
content: "\2713";background-color: #fff;
position: absolute;top: 0;left: 0;
width:100%;border: 1px solid #00D2D6;color:#00D2D6;
font-size: 18px;font-weight: bold;
}
/* myTable */ /* myTable */
.myTable{ .myTable{
width: 100%; width: 100%;
...@@ -214,10 +231,6 @@ ...@@ -214,10 +231,6 @@
background: #BEEFF0; background: #BEEFF0;
color: #28CACC; color: #28CACC;
} }
.greenSpan{
background: #BEEFF0;
color: #28CACC;
}
.purpleSpan{ .purpleSpan{
background: #D7D6FF; background: #D7D6FF;
color: #7B78FF; color: #7B78FF;
...@@ -294,4 +307,43 @@ ...@@ -294,4 +307,43 @@
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 4; -webkit-line-clamp: 4;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
}
.backTo{
width:80px;
height:34px;
line-height:34px;
background:rgba(0,210,214,1);
border-radius:17px;
text-align: center;
color: #fff;
font-size: 12px;
font-family: "宋体";
display: inline-block;
margin-left:15px;
cursor: pointer;
}
/* 日志 */
.detailsIT_Journal .InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.detailsIT_Journal .changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
.detailsIT_Journal .changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
.detailsIT_Journal ._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
.detailsIT_Journal .changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
.zcSpanQuery{
position: absolute;
right: 50px;
top: -60px;
display: inline-block;
width:75px;
height:32px;
line-height:32px;
background:rgba(0,210,214,1);
border-radius:17px;
text-align: center;
color: #fff;
font-size: 12px;
font-family: "宋体";
display: inline-block;
margin-left:15px;
cursor: pointer;
} }
\ No newline at end of file
src/assets/css/reset.css
View file @ 85240dac
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
.el-input{ .el-input{
display: inline-block; display: inline-block;
} }
.el-input.is-disabled .el-input__inner{
background-color: #fff;
border-color: #fff;
}
.queryul { .queryul {
margin-top: 20px; margin-top: 20px;
} }
...@@ -89,6 +93,10 @@ ...@@ -89,6 +93,10 @@
.queryul li span>em{display: inline-block; min-width: 80px; text-align: right; font-style: normal; margin:0 15px 0 0;} .queryul li span>em{display: inline-block; min-width: 80px; text-align: right; font-style: normal; margin:0 15px 0 0;}
/* dialog */ /* dialog */
.el-dialog__wrapper{
display: flex;
align-items: center;
}
.el-dialog__body{ .el-dialog__body{
padding:0 20px 15px 20px; padding:0 20px 15px 20px;
} }
...@@ -196,7 +204,7 @@ ...@@ -196,7 +204,7 @@
} }
.MyEditForm .btnformItem span{ .MyEditForm .btnformItem span{
display: inline-block; display: inline-block;
width:120px; width:100px;
height:40px; height:40px;
line-height:40px; line-height:40px;
border-radius:22px; border-radius:22px;
...@@ -336,4 +344,35 @@ ...@@ -336,4 +344,35 @@
} }
.el-tooltip{ .el-tooltip{
cursor: pointer; cursor: pointer;
}
/* 修改树节点 */
/*树节点前面的图标修改*/
.el-tree .el-tree-node__expand-icon.expanded
{
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
.el-tree .el-icon-caret-right:before
{
background: url("../img/treejia.png") no-repeat center center;
content: '';
display: block;
width: 20px;
height: 20px;
font-size: 18px;
}
.el-tree .el-tree-node__expand-icon.expanded.el-icon-caret-right:before
{
background: url("../img/treejian.png") no-repeat center center;
content: '';
display: block;
width: 20px;
height: 20px;
font-size: 18px;
}
.el-tree-node__expand-icon.is-leaf::before
{
display: none;
} }
\ No newline at end of file
src/assets/css/vxetable.css
View file @ 85240dac
...@@ -81,3 +81,10 @@ ...@@ -81,3 +81,10 @@
.vxe-table table{ .vxe-table table{
overflow: hidden; overflow: hidden;
} }
.vxe-checkbox.is--indeterminate>input:not(:checked)+.vxe-checkbox--icon{
background-color: #28CACC;
border-color: #28CACC;
}
.vxe-toolbar.is--loading:before{
background-color: rgba(0,0,0,0);
}
src/components/Home.vue
View file @ 85240dac
This diff is collapsed.
src/components/Materialman/Archivesmaterials.vue
View file @ 85240dac
...@@ -93,15 +93,15 @@ ...@@ -93,15 +93,15 @@
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
<el-form-item prop="Name"> <el-form-item prop="Name">
<span class="label">档案名称</span> <span class="label">档案名称</span>
<el-input size="small" v-model="addMsg.Name"></el-input> <el-input size="small" v-model="addMsg.Name" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">档案编码</span> <span class="label">档案编码</span>
<el-input size="small" v-model="addMsg.SuppliesNum"></el-input> <el-input size="small" v-model="addMsg.SuppliesNum" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="BrandName"> <el-form-item prop="BrandName">
<span class="label">品牌名称</span> <span class="label">品牌名称</span>
<el-input size="small" v-model="addMsg.BrandName"></el-input> <el-input size="small" v-model="addMsg.BrandName" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="treeItem" style="float:left;"> <el-form-item class="treeItem" style="float:left;">
<span class="label">分类</span> <span class="label">分类</span>
...@@ -110,43 +110,35 @@ ...@@ -110,43 +110,35 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">供应商名称</span> <span class="label">供应商名称</span>
<el-input size="small" v-model="addMsg.SupplierName"></el-input> <el-input size="small" v-model="addMsg.SupplierName" placeholder="请输入"></el-input>
<!-- <el-select size="mini" v-model="addMsg.SupplierName" placeholder="请选择">
<el-option
v-for="item in supplierList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select> -->
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">安全库存</span> <span class="label">安全库存</span>
<el-input size="small" v-model="addMsg.SafetyStock"></el-input> <el-input size="small" v-model="addMsg.SafetyStock" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">预警预存</span> <span class="label">预警预存</span>
<el-input size="small" v-model="addMsg.ReservedStock"></el-input> <el-input size="small" v-model="addMsg.ReservedStock" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">型号</span> <span class="label">型号</span>
<el-input size="small" v-model="addMsg.SuppliesModel"></el-input> <el-input size="small" v-model="addMsg.SuppliesModel" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">单位</span> <span class="label">单位</span>
<el-input size="small" v-model="addMsg.Units"></el-input> <el-input size="small" v-model="addMsg.Units" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="Money"> <el-form-item prop="Money">
<span class="label">成本价</span> <span class="label">成本价</span>
<el-input size="small" v-model="addMsg.Money"></el-input> <el-input size="small" v-model="addMsg.Money" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">条形码号</span> <span class="label">条形码号</span>
<el-input size="small" v-model="addMsg.Barcode"></el-input> <el-input size="small" v-model="addMsg.Barcode" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">备注</span> <span class="label">备注</span>
<el-input size="small" v-model="addMsg.Remark"></el-input> <el-input size="small" v-model="addMsg.Remark" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<div class="_addUpload_box"> <div class="_addUpload_box">
<ul class="uploadUl"> <ul class="uploadUl">
......
src/components/Materialman/ConsumRecipients.vue
View file @ 85240dac
...@@ -7,15 +7,15 @@ ...@@ -7,15 +7,15 @@
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <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=""> <img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span> </span>
<span @click="Export('GetRecipientsQueryPageListToExcel','领用')" style="margin-left:20px" class="addSpan">导出</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"> <!-- <span @click="addSupplier" 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>
<ul v-show="morequery" class="queryul"> <ul v-show="morequery" class="queryul">
<li> <li>
<el-select size="small" v-model="msg.SuppliesId" placeholder="物料"> <el-select size="small" filterable clearable v-model="msg.SuppliesId" placeholder="物料">
<el-option <el-option
v-for="item in wulaioList" v-for="item in wulaioList"
:key="item.Id" :key="item.Id"
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select size="small" filterable v-model="msg.EmployeeId" placeholder="使用人" :filter-method="getEmployee"> <el-select size="small" filterable clearable v-model="msg.EmployeeId" placeholder="使用人" :filter-method="getEmployee">
<el-option <el-option
v-for="item in EmployeeList" v-for="item in EmployeeList"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -60,15 +60,15 @@ ...@@ -60,15 +60,15 @@
:normalizer="normalizer"/> :normalizer="normalizer"/>
</li> </li>
</ul> </ul>
<vxe-grid :loading="loading" <!-- <vxe-grid :loading="loading"
:columns="tableColumn" :columns="tableColumn"
:toolbar="tableToolbar" :toolbar="tableToolbar"
:data="tableData" :data="tableData"
show-footer show-footer
:footer-method="footerMethod" :footer-method="footerMethod"
:edit-config="{trigger: 'click', mode: 'row', showStatus: true}"></vxe-grid> :edit-config="{trigger: 'click', mode: 'row', showStatus: true}"></vxe-grid> -->
<!-- --> <!-- -->
<!-- <vxe-table style="margin-top:15px" <vxe-table style="margin-top:15px"
:data="tableData"> :data="tableData">
<vxe-table-column field="BranchName" title="公司名称"></vxe-table-column> <vxe-table-column field="BranchName" title="公司名称"></vxe-table-column>
<vxe-table-column field="DepartmentName" title="部门名称"></vxe-table-column> <vxe-table-column field="DepartmentName" title="部门名称"></vxe-table-column>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<vxe-table-column field="CategoryName" 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="StockOutNum" title="领取单号"></vxe-table-column>
<vxe-table-column field="StockOutDate" title="领取日期"></vxe-table-column> <vxe-table-column field="StockOutDate" title="领取日期"></vxe-table-column>
</vxe-table> --> </vxe-table>
<el-pagination <el-pagination
@current-change="currentChange" @current-change="currentChange"
background background
...@@ -173,7 +173,15 @@ export default { ...@@ -173,7 +173,15 @@ export default {
this.getDepartment(); this.getDepartment();
}, },
methods:{ methods:{
footerMethod ({ columns, data }) { Export(url,name){
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
`/api/Supplies/${url}`,
msg,
`${name}报表.xls`
);
},
footerMethod ({ columns, data }) {
return [ return [
columns.map((column, columnIndex) => { columns.map((column, columnIndex) => {
if (columnIndex === 0) { if (columnIndex === 0) {
...@@ -228,7 +236,6 @@ export default { ...@@ -228,7 +236,6 @@ export default {
getEmployee(val){ getEmployee(val){
this.apiJavaPost("/api/User/GetEmployeeList",{EmName:val}, this.apiJavaPost("/api/User/GetEmployeeList",{EmName:val},
res => { res => {
this.loading=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.EmployeeList=res.data.data; this.EmployeeList=res.data.data;
} else { } else {
......
src/components/Materialman/Materialwarehouse.vue
View file @ 85240dac
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
<el-form-item prop="Name" style="margin-left:60px;"> <el-form-item prop="Name" style="margin-left:60px;">
<span class="label">仓库名称</span> <span class="label">仓库名称</span>
<el-input v-model="addMsg.Name"></el-input> <el-input v-model="addMsg.Name" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<div class="btnformItem"> <div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span> <span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
......
src/components/Materialman/SpotQuery.vue
View file @ 85240dac
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <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=""> <img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span> </span>
<span @click="Export('GetInventoryPageListToExcel','库存')" style="margin-left:20px" class="addSpan">导出</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="chongzhi" style="margin-left:20px" class="addSpan">重置</span> -->
<!-- <span @click="addSupplier" style="margin-left:20px" class="addSpan"> <!-- <span @click="addSupplier" style="margin-left:20px" class="addSpan">
...@@ -15,7 +16,7 @@ ...@@ -15,7 +16,7 @@
</div> </div>
<ul v-show="morequery" class="queryul"> <ul v-show="morequery" class="queryul">
<li> <li>
<el-select size="small" v-model="msg.WarehouseId" placeholder="仓库"> <el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库">
<el-option <el-option
v-for="item in getWareHouseList" v-for="item in getWareHouseList"
:key="item.Id" :key="item.Id"
...@@ -26,7 +27,7 @@ ...@@ -26,7 +27,7 @@
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.SuppliesId" placeholder="物料"> <el-select size="small" filterable clearable v-model="msg.SuppliesId" placeholder="物料">
<el-option <el-option
v-for="item in wulaioList" v-for="item in wulaioList"
:key="item.Id" :key="item.Id"
...@@ -48,18 +49,19 @@ ...@@ -48,18 +49,19 @@
<vxe-table-column field="SafetyStock" 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="ReservedStock" title="预留库存"></vxe-table-column>
<vxe-table-column field="UnitPrice" 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="Number" title="库存数量">
<!-- <template v-slot="{ row }">
<span v-if="row.Number < row.SafetyStock" style="color:red">{{row.Number}}</span>
<span v-else>{{row.Number}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="address" title="操作"> <vxe-table-column field="address" title="操作">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="编辑" placement="top"> <el-tooltip class="item" effect="dark" content="日志" placement="top">
<img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt=""> <img @click="Operation(row)" style="width:24px;height:24px" src="../../assets/img/czrz.png" alt="">
</el-tooltip> </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> </template>
</vxe-table-column> --> </vxe-table-column>
</vxe-table> </vxe-table>
<el-pagination <el-pagination
@current-change="currentChange" @current-change="currentChange"
...@@ -68,7 +70,58 @@ ...@@ -68,7 +70,58 @@
layout="prev, pager, next" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
<!-- 操作日志 -->
<el-dialog
title="操作日志"
:visible.sync="caozuoState"
top="3%"
width="650px"
>
<div class="f12">
<span>名称：{{ OperationInfo.SuppliesName }}</span>
<span style="margin:0 20px"
>编码：{{ OperationInfo.SuppliesNum }}</span
>
</div>
<table
class="myTable miniTable"
v-loading="loading"
border="0"
cellspacing="0"
cellpadding="0"
>
<thead>
<th>类型</th>
<th>数量</th>
<th>金额</th>
<th>内容</th>
<th>操作人/时间</th>
</thead>
<tbody>
<tr v-for="(item, index) in OperationList" :key="index">
<td>{{ item.TypeName }}</td>
<td>{{ item.Number }}</td>
<td>{{ item.Money }}</td>
<td>{{ item.Description }}</td>
<td>
<p>{{ item.UpdateBy }}</p>
<p>{{ item.UpdateDate }}</p>
</td>
</tr>
<tr v-show="OperationList.length == 0">
<td colspan="4" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<el-pagination
@current-change="currentChange1"
background
:page-size="msg1.pageSize"
layout="prev, pager, next"
:total="total1"
>
</el-pagination>
</el-dialog>
</div> </div>
</template> </template>
...@@ -79,6 +132,7 @@ export default { ...@@ -79,6 +132,7 @@ export default {
name: 'Supplierman', name: 'Supplierman',
data(){ data(){
return{ return{
caozuoState: false,
morequery:false, morequery:false,
currentPage:1, currentPage:1,
tableData: [], tableData: [],
...@@ -110,6 +164,18 @@ export default { ...@@ -110,6 +164,18 @@ export default {
SupplierName:'' SupplierName:''
}, },
wulaioList:[], wulaioList:[],
OperationLoad:false,
OperationList:[],
total1:0,
msg1:{
pageIndex:1,
pageSize:6,
WarehouseId:0,
SuppliesId:0,
},
OperationInfo:{},
} }
}, },
mounted(){ mounted(){
...@@ -118,6 +184,43 @@ export default { ...@@ -118,6 +184,43 @@ export default {
this.getwuliaoList(); this.getwuliaoList();
}, },
methods:{ methods:{
Operation(item) {
console.log("item",item)
this.OperationInfo = item;
this.caozuoState = true;
this.msg1.WarehouseId = item.WarehouseId;
this.msg1.SuppliesId = item.SuppliesId;
this.getOperation();
},
currentChange1(val) {
this.msg1.pageIndex = val;
this.getOperation();
},
getOperation() {
this.OperationLoad = true;
this.apiJavaPost(
"/api/Supplies/GetInventoryDetailPageList",
this.msg1,
res => {
this.OperationLoad = false;
if (res.data.resultCode === 1) {
this.OperationList = res.data.data.pageData;
this.total1 = res.data.data.count;
} else {
this.Error(res.data.message);
}
},
null
);
},
Export(url,name){
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
`/api/Supplies/${url}`,
msg,
`${name}报表.xls`
);
},
// 仓库列表 // 仓库列表
getWareHouse(){ getWareHouse(){
this.apiJavaPost("/api/Supplies/GetWareHouseList",{Name:''}, this.apiJavaPost("/api/Supplies/GetWareHouseList",{Name:''},
......
src/components/Materialman/chukudan.vue
View file @ 85240dac
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<img v-show="morequery" class="roatImg" 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>
<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="Export" style="margin-left:20px" class="addSpan">导出</span>
<span @click="addSupplier" style="margin-left:20px" class="addSpan"> <span @click="addSupplier" 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>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商"></el-input> <el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商"></el-input>
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.WarehouseId" placeholder="仓库"> <el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库">
<el-option <el-option
v-for="item in getWareHouseList" v-for="item in getWareHouseList"
:key="item.Id" :key="item.Id"
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1"> <el-select filterable clearable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1">
<el-option <el-option
v-for="item in EmployeeList1" v-for="item in EmployeeList1"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
<th>品牌名称</th> <th>品牌名称</th>
<th>库存</th> <th>库存</th>
<th>数量</th> <th>数量</th>
<th>领取人</th>
<th>出库时间</th> <th>出库时间</th>
<th width="150px">操作</th> <th width="150px">操作</th>
</thead> </thead>
...@@ -81,6 +82,7 @@ ...@@ -81,6 +82,7 @@
<!-- <span class="commonStyle hoverSpan1"></span> --> <!-- <span class="commonStyle hoverSpan1"></span> -->
<span class="ColorSpan redSpan" v-if="item.StockOutState==2">取</span> <span class="ColorSpan redSpan" v-if="item.StockOutState==2">取</span>
<span class="ColorSpan greenSpan" v-if="item.StockOutState==1">已</span> <span class="ColorSpan greenSpan" v-if="item.StockOutState==1">已</span>
<span class="ColorSpan purpleSpan" v-if="item.StockOutState==3">待</span>
{{item.StockOutStateStr}} {{item.StockOutStateStr}}
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutNum}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutNum}}</td>
...@@ -92,12 +94,12 @@ ...@@ -92,12 +94,12 @@
<td>{{delist.BrandName}}</td> <td>{{delist.BrandName}}</td>
<td>{{delist.InventoryNum}}</td> <td>{{delist.InventoryNum}}</td>
<td>{{delist.Number}}</td> <td>{{delist.Number}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.EmName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutDate}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutDate}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0"> <td :rowspan="item.DetailList.length" v-if="index==0">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<!-- <el-tooltip class="item" effect="dark" content="编辑" placement="top"> <img v-if="item.StockOutState==3" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt=""> </el-tooltip>
</el-tooltip> -->
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt=""> <img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip> </el-tooltip>
...@@ -147,7 +149,7 @@ ...@@ -147,7 +149,7 @@
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<span class="label">领取人</span> <span class="label">领取人</span>
<el-select filterable size="small" v-model="addMsg.EmployeeId" placeholder="使用人" :filter-method="getEmployee2"> <el-select filterable size="small" v-model="addMsg.EmployeeId" placeholder="请输入名字" :filter-method="getEmployee2">
<el-option <el-option
v-for="item in EmployeeList2" v-for="item in EmployeeList2"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -231,6 +233,7 @@ ...@@ -231,6 +233,7 @@
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>档案编码</th>
<th>物料名称</th> <th>物料名称</th>
<th><span class="cred">库存</span></th> <th><span class="cred">库存</span></th>
<th>分类名称</th> <th>分类名称</th>
...@@ -239,7 +242,6 @@ ...@@ -239,7 +242,6 @@
<th>供应商名称</th> <th>供应商名称</th>
<th>条形码号</th> <th>条形码号</th>
<th>型号</th> <th>型号</th>
<th>档案编码</th>
<th>操作人</th> <th>操作人</th>
<th>备注</th> <th>备注</th>
</thead> </thead>
...@@ -248,6 +250,7 @@ ...@@ -248,6 +250,7 @@
<td> <td>
<input class="color-input-red" type="checkbox" v-model="wlcheckList" :value="item" @change="wlcheckOne"> <input class="color-input-red" type="checkbox" v-model="wlcheckList" :value="item" @change="wlcheckOne">
</td> </td>
<td>{{item.SuppliesNum}}</td>
<td>{{item.Name}}</td> <td>{{item.Name}}</td>
<td class="cred">{{item.InventoryNum}}</td> <td class="cred">{{item.InventoryNum}}</td>
<td>{{item.CategoryName}}</td> <td>{{item.CategoryName}}</td>
...@@ -256,7 +259,6 @@ ...@@ -256,7 +259,6 @@
<td>{{item.SupplierName}}</td> <td>{{item.SupplierName}}</td>
<td>{{item.Barcode}}</td> <td>{{item.Barcode}}</td>
<td>{{item.SuppliesModel}}</td> <td>{{item.SuppliesModel}}</td>
<td>{{item.SuppliesNum}}</td>
<td>{{item.UpdateBy}}</td> <td>{{item.UpdateBy}}</td>
<td>{{item.Remark}}</td> <td>{{item.Remark}}</td>
...@@ -308,6 +310,7 @@ export default { ...@@ -308,6 +310,7 @@ export default {
addMsg:{ addMsg:{
Id:0, Id:0,
WarehouseId:'', WarehouseId:'',
EmployeeId:'',
StockOutDate:'', StockOutDate:'',
Remark:'', Remark:'',
DetailList:[], DetailList:[],
...@@ -359,6 +362,14 @@ export default { ...@@ -359,6 +362,14 @@ export default {
}, },
methods:{ methods:{
Export(){
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
"/api/Supplies/GetStockOutPageListToExcel",
msg,
"出库单.xls"
);
},
changeNUmber(item,index){ changeNUmber(item,index){
this.$forceUpdate() this.$forceUpdate()
}, },
...@@ -422,6 +433,7 @@ export default { ...@@ -422,6 +433,7 @@ export default {
}) })
} }
}, },
// 移出物料
ycwuitemList(){ ycwuitemList(){
if(this.ItemCheckList.length==0){ if(this.ItemCheckList.length==0){
return; return;
...@@ -431,13 +443,9 @@ export default { ...@@ -431,13 +443,9 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
var set=this.ItemCheckList.map(item=>item.Id) var set=this.ItemCheckList.map(item=>item.SuppliesId)
var resArr=this.wlItemList.filter(item=>!set.includes(item.SuppliesId)) var resArr=this.wlItemList.filter(item=>!set.includes(item.SuppliesId))
this.wlItemList=resArr; this.wlItemList=resArr;
this.addMsg.Money=0;
this.wlItemList.forEach(x=>{
this.addMsg.Money+=Number(x.Money)
})
}).catch(() => { }).catch(() => {
}); });
...@@ -488,6 +496,7 @@ export default { ...@@ -488,6 +496,7 @@ export default {
this.getWuliao(); this.getWuliao();
}, },
getWuliao(){ getWuliao(){
this.wlcheckList=[];
this.wuliaomsg.WareHouseId=this.addMsg.WarehouseId; this.wuliaomsg.WareHouseId=this.addMsg.WarehouseId;
this.apiJavaPost("/api/Supplies/GetMaterialPageList",this.wuliaomsg, this.apiJavaPost("/api/Supplies/GetMaterialPageList",this.wuliaomsg,
res => { res => {
...@@ -499,6 +508,7 @@ export default { ...@@ -499,6 +508,7 @@ export default {
item.Number=''; item.Number='';
item.Remark=''; item.Remark='';
item.SuppliesId=item.Id; item.SuppliesId=item.Id;
item.SuppliesName=item.Name;
}) })
this.wlcheckAllList=data; this.wlcheckAllList=data;
...@@ -527,6 +537,7 @@ export default { ...@@ -527,6 +537,7 @@ export default {
Id:0, Id:0,
WarehouseId:'', WarehouseId:'',
StockOutDate:'', StockOutDate:'',
EmployeeId:'',
Remark:'', Remark:'',
DetailList:[], DetailList:[],
} }
...@@ -598,24 +609,20 @@ export default { ...@@ -598,24 +609,20 @@ export default {
null null
); );
}, },
// Edit(item){ Edit(item){
// if(item.StockInState==1){ this.dialogState=true;
// this.Error("入库单已完成，无法修改！") this.addMsg={
// return; Id:item.Id,
// } WarehouseId:item.WarehouseId,
// this.dialogState=true; Remark:item.Remark,
// this.addMsg={ EmployeeId:item.EmployeeId,
// Id:item.Id, StockOutDate:item.StockOutDate,
// WarehouseId:item.WarehouseId, DetailList:[],
// Remark:item.Remark, }
// StockOutDate:item.StockOutDate, this.wlItemList=item.DetailList;
// Money:item.Money, this.EmName=item.EmName;
// SupplierName:item.SupplierName, this.getEmployee(2);
// SuppliesId:item.SuppliesId, },
// DetailList:[],
// }
// this.wlItemList=item.DetailList;
// },
Delete(item){ Delete(item){
let Id=item.Id; let Id=item.Id;
this.$confirm("确认删除？","提示", { this.$confirm("确认删除？","提示", {
......
src/components/Materialman/rukudan.vue
View file @ 85240dac
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<img v-show="morequery" class="roatImg" 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>
<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="Export" style="margin-left:20px" class="addSpan">导出</span>
<span @click="addSupplier" style="margin-left:20px" class="addSpan"> <span @click="addSupplier" 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>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商"></el-input> <el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商"></el-input>
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.WarehouseId" placeholder="仓库"> <el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库">
<el-option <el-option
v-for="item in getWareHouseList" v-for="item in getWareHouseList"
:key="item.Id" :key="item.Id"
...@@ -220,6 +220,7 @@ ...@@ -220,6 +220,7 @@
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>档案编码</th>
<th>物料名称</th> <th>物料名称</th>
<th>分类名称</th> <th>分类名称</th>
<th>品牌名</th> <th>品牌名</th>
...@@ -228,7 +229,6 @@ ...@@ -228,7 +229,6 @@
<th>条形码号</th> <th>条形码号</th>
<th>库存</th> <th>库存</th>
<th>型号</th> <th>型号</th>
<th>档案编码</th>
<th>操作人</th> <th>操作人</th>
<th>备注</th> <th>备注</th>
</thead> </thead>
...@@ -237,6 +237,7 @@ ...@@ -237,6 +237,7 @@
<td> <td>
<input class="color-input-red" type="checkbox" v-model="wlcheckList" :value="item" @change="wlcheckOne"> <input class="color-input-red" type="checkbox" v-model="wlcheckList" :value="item" @change="wlcheckOne">
</td> </td>
<td>{{item.SuppliesNum}}</td>
<td>{{item.Name}}</td> <td>{{item.Name}}</td>
<td>{{item.CategoryName}}</td> <td>{{item.CategoryName}}</td>
<td>{{item.BrandName}}</td> <td>{{item.BrandName}}</td>
...@@ -245,7 +246,6 @@ ...@@ -245,7 +246,6 @@
<td>{{item.Barcode}}</td> <td>{{item.Barcode}}</td>
<td>{{item.SuppliesModel}}</td> <td>{{item.SuppliesModel}}</td>
<td>{{item.SuppliesModel}}</td> <td>{{item.SuppliesModel}}</td>
<td>{{item.SuppliesNum}}</td>
<td>{{item.UpdateBy}}</td> <td>{{item.UpdateBy}}</td>
<td>{{item.Remark}}</td> <td>{{item.Remark}}</td>
...@@ -335,6 +335,11 @@ export default { ...@@ -335,6 +335,11 @@ export default {
ItemisCkedAll:false, ItemisCkedAll:false,
ItemCheckList:[], ItemCheckList:[],
tableHeight:0, tableHeight:0,
pickerOptions: {
　　disabledDate(time) {
　　　　return time.getTime() < Date.now() - 24 * 60 * 60 * 1000
}
},
} }
}, },
created(){ created(){
...@@ -348,6 +353,14 @@ export default { ...@@ -348,6 +353,14 @@ export default {
}, },
methods:{ methods:{
Export(){
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
"/api/Supplies/GetStockInPageListToExcel",
msg,
"入库单.xls"
);
},
Huifu(item){ Huifu(item){
this.apiJavaPost("/api/Supplies/RecoverStockInInfo",{StockInId:item.Id}, this.apiJavaPost("/api/Supplies/RecoverStockInInfo",{StockInId:item.Id},
res => { res => {
...@@ -458,6 +471,7 @@ export default { ...@@ -458,6 +471,7 @@ export default {
this.getWuliao(); this.getWuliao();
}, },
getWuliao(){ getWuliao(){
this.wlcheckList=[];
this.apiJavaPost("/api/Supplies/GetMaterialPageList",this.wuliaomsg, this.apiJavaPost("/api/Supplies/GetMaterialPageList",this.wuliaomsg,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
......
src/components/Systemman/AssetsClassification.vue
View file @ 85240dac
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
:props="defaultProps" :props="defaultProps"
:data="data" :data="data"
node-key="id" node-key="id"
default-expand-all
:expand-on-click-node="false"> :expand-on-click-node="false">
<span class="TreeSpan" slot-scope="{ node, data }"> <span class="TreeSpan" slot-scope="{ node, data }">
<span>{{ node.label}}</span> <span>{{ node.label}}</span>
......
src/components/Systemman/MaterialClassification.vue
View file @ 85240dac
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
:props="defaultProps" :props="defaultProps"
:data="data" :data="data"
node-key="id" node-key="id"
default-expand-all
:expand-on-click-node="false"> :expand-on-click-node="false">
<span class="TreeSpan" slot-scope="{ node, data }"> <span class="TreeSpan" slot-scope="{ node, data }">
<span>{{ node.label}}</span> <span>{{ node.label}}</span>
......
src/components/Systemman/Supplierman.vue
View file @ 85240dac
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
<el-dialog <el-dialog
:title="dialogtitle" :title="dialogtitle"
:visible.sync="dialogState" :visible.sync="dialogState"
top="0"
width="530px"> width="530px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix"> <div class="basefix">
......
src/components/approval/SignMan.vue
View file @ 85240dac
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<el-input class="w200" size="small" v-model="msg.PropertyName" placeholder="资产名称"></el-input> <el-input class="w200" size="small" v-model="msg.PropertyName" placeholder="资产名称"></el-input>
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.AuditStatus" placeholder="状态"> <el-select size="small" filterable clearable v-model="msg.AuditStatus" placeholder="状态">
<el-option <el-option
v-for="item in StateEnumList" v-for="item in StateEnumList"
:key="item.Id" :key="item.Id"
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1"> <el-select filterable clearable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1">
<el-option <el-option
v-for="item in EmployeeList1" v-for="item in EmployeeList1"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="msg.Source" placeholder="来源"> <el-select filterable clearable size="small" v-model="msg.Source" placeholder="来源">
<el-option <el-option
v-for="item in SourceList" v-for="item in SourceList"
:key="item.Id" :key="item.Id"
......
src/components/approval/approvalDetails.vue
View file @ 85240dac
...@@ -19,43 +19,60 @@ ...@@ -19,43 +19,60 @@
<span v-if="GetDetail.AuditStatus==3 || GetDetail.AuditStatus==5" class="wtg">{{GetDetail.AuditStatusName}}</span> <span v-if="GetDetail.AuditStatus==3 || GetDetail.AuditStatus==5" class="wtg">{{GetDetail.AuditStatusName}}</span>
</el-col> </el-col>
</el-row> </el-row>
<el-row class="zcInfo"> <el-row>
<el-col :span="12"> <el-col :span="18">
<span>来源 :</span> <el-row class="zcInfo">
<span>{{GetDetail.SourceName}}</span> <el-col :span="12">
</el-col> <span>来源 :</span>
<el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5" :span="12"> <span>{{GetDetail.SourceName}}</span>
<span>申请人 :</span> </el-col>
<span>{{GetDetail.EmName}}</span> <el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5 && GetDetail.Source!=6" :span="12">
</el-col> <span>申请人 :</span>
<el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5" :span="12"> <span>{{GetDetail.EmName}}</span>
<span>公司 :</span> </el-col>
<span>{{GetDetail.BranchName}}</span> <el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5 && GetDetail.Source!=6" :span="12">
</el-col> <span>公司 :</span>
<el-col v-if="GetDetail.Source==5" :span="12"> <span>{{GetDetail.BranchName}}</span>
<span>调入公司 :</span> </el-col>
<span>{{GetDetail.InBranchName}}</span> <el-col v-if="GetDetail.Source==5" :span="12">
</el-col> <span>调入公司 :</span>
<span>{{GetDetail.InBranchName}}</span>
<el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5" :span="12"> </el-col>
<span>部门 :</span>
<span>{{GetDetail.DepartmentName}}</span> <el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5 && GetDetail.Source!=6" :span="12">
</el-col> <span>部门 :</span>
<el-col :span="12"> <span>{{GetDetail.DepartmentName}}</span>
<span>单号 :</span> </el-col>
<span>{{GetDetail.OrderCode}}</span> <el-col :span="12">
</el-col> <span>单号 :</span>
<el-col :span="12"> <span>{{GetDetail.OrderCode}}</span>
<span>时间 :</span> </el-col>
<span v-if="GetDetail.Time!=''">{{GetDetail.Time}}</span> <el-col :span="12">
<span v-if="GetDetail.BackTime!=''">{{GetDetail.BackTime}}</span> <span>时间 :</span>
<span v-if="GetDetail.Time!=''">{{GetDetail.Time}}</span>
<span v-if="GetDetail.BackTime!=''">
<a v-if="GetDetail.Time!='' && GetDetail.BackTime!=''">~</a>
{{GetDetail.BackTime}}
</span>
</el-col>
<el-col :span="12">
<span>备注 :</span>
<span>{{GetDetail.Remark}}</span>
</el-col>
</el-row>
</el-col> </el-col>
<el-col :span="12"> <!--图片 -->
<span>备注 :</span> <el-col v-if="GetDetail.ImageList && GetDetail.ImageList.length>0" :span="6" style="padding-top:20px">
<span>{{GetDetail.Remark}}</span> <el-carousel height="150px" trigger="click" :interval="20000">
<el-carousel-item style="text-align:center;line-height:150px" v-for="item in GetDetail.ImageList" :key="item">
<img @click="showImg(GetDetail)" style="max-width:100%;max-height:100%" :src="item" alt="">
</el-carousel-item>
</el-carousel>
</el-col> </el-col>
</el-row> </el-row>
<p class="f12 c11" style="margin-top:25px">资产清单</p> <p class="f12 c11" style="margin-top:25px">资产清单</p>
<table style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0"> <table style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
...@@ -880,25 +897,6 @@ export default { ...@@ -880,25 +897,6 @@ export default {
width: 80px; width: 80px;
font-size: 14px; font-size: 14px;
} }
.approvalDetails .backTo{
width:80px;
height:34px;
line-height:34px;
background:rgba(0,210,214,1);
border-radius:17px;
text-align: center;
color: #fff;
font-size: 12px;
font-family: "宋体";
display: inline-block;
margin-left:15px;
cursor: pointer;
}
.detailsIT_Journal .InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.detailsIT_Journal .changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
.detailsIT_Journal .changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
.detailsIT_Journal ._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
.detailsIT_Journal .changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
.approvalDetails ._textareaNew{ .approvalDetails ._textareaNew{
width: 80%; width: 80%;
height: 50px; height: 50px;
......
src/components/approval/approvalMan.vue
View file @ 85240dac
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<el-input class="w200" size="small" v-model="msg.PropertyName" placeholder="资产名称"></el-input> <el-input class="w200" size="small" v-model="msg.PropertyName" placeholder="资产名称"></el-input>
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.AuditStatus" placeholder="状态"> <el-select size="small" filterable clearable v-model="msg.AuditStatus" placeholder="状态">
<el-option <el-option
v-for="item in StateEnumList" v-for="item in StateEnumList"
:key="item.Id" :key="item.Id"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1"> <el-select filterable clearable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1">
<el-option <el-option
v-for="item in EmployeeList1" v-for="item in EmployeeList1"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="msg.Source" placeholder="来源"> <el-select filterable clearable size="small" v-model="msg.Source" placeholder="来源">
<el-option <el-option
v-for="item in SourceList" v-for="item in SourceList"
:key="item.Id" :key="item.Id"
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<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"
......
src/components/assetsman/LendReturn.vue
View file @ 85240dac
This diff is collapsed.
src/components/assetsman/PaiTui.vue
View file @ 85240dac
This diff is collapsed.
src/components/assetsman/assetsList.vue
View file @ 85240dac
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<el-select <el-select
size="small" size="small"
v-model="msg.PropertyStatus" v-model="msg.PropertyStatus"
placeholder="资产状态" placeholder="资产状态" clearable filterable
> >
<el-option <el-option
v-for="item in PropertyStatusList" v-for="item in PropertyStatusList"
...@@ -81,8 +81,8 @@ ...@@ -81,8 +81,8 @@
</li> </li>
<li> <li>
<el-select <el-select
size="small" size="small"
filterable filterable clearable
v-model="msg.EmployeeId" v-model="msg.EmployeeId"
placeholder="使用人" placeholder="使用人"
:filter-method="getEmployee1" :filter-method="getEmployee1"
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.SupplierId" placeholder="供应商"> <el-select clearable size="small" v-model="msg.SupplierId" placeholder="供应商">
<el-option <el-option
v-for="item in supplierList" v-for="item in supplierList"
:key="item.Id" :key="item.Id"
:label="item.Name" :label="item.Name"
...@@ -154,8 +154,9 @@ ...@@ -154,8 +154,9 @@
>借</span >借</span
> >
<span class="ColorSpan buleSpan" v-if="item.PropertyStatus == 4" <span class="ColorSpan buleSpan" v-if="item.PropertyStatus == 4"
>调</span >调</span>
> <span class="ColorSpan redSpan" v-if="item.PropertyStatus == 10"
>处</span>
<span <span
class="ColorSpan purpleSpan" class="ColorSpan purpleSpan"
v-if=" v-if="
...@@ -218,14 +219,14 @@ ...@@ -218,14 +219,14 @@
<img <img
@click="Operation(item)" @click="Operation(item)"
style="width:24px;height:24px" style="width:24px;height:24px"
src="../../assets/img/qx.png" src="../../assets/img/czrz.png"
alt="" alt=""
/> />
</el-tooltip> </el-tooltip>
<span class="commonStyle hoverSpan2"></span> <span class="commonStyle hoverSpan2"></span>
</td> </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>
...@@ -242,7 +243,7 @@ ...@@ -242,7 +243,7 @@
<el-dialog <el-dialog
:title="dialogtitle" :title="dialogtitle"
:visible.sync="dialogState" :visible.sync="dialogState"
top="2%" top="0"
width="975px" width="975px"
> >
<el-form <el-form
...@@ -260,11 +261,11 @@ ...@@ -260,11 +261,11 @@
<div class="basefix"> <div class="basefix">
<el-form-item label=""> <el-form-item label="">
<span class="label">使用人</span> <span class="label">使用人</span>
<el-select <el-select :disabled="baseformItem"
size="mini" size="mini"
filterable filterable
v-model="addMsg.EmployeeId" v-model="addMsg.EmployeeId"
placeholder="请选择" placeholder="请输入姓名"
:filter-method="getEmployee2" :filter-method="getEmployee2"
> >
<el-option <el-option
...@@ -277,11 +278,12 @@ ...@@ -277,11 +278,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<p class="label">领取时间</p> <p class="label" style="padding-top:4px">领取时间</p>
<el-date-picker <el-date-picker :disabled="baseformItem"
size="mini" size="mini"
v-model="addMsg.GetTime" v-model="addMsg.GetTime"
type="date" type="date"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
> >
...@@ -382,7 +384,7 @@ ...@@ -382,7 +384,7 @@
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<span class="label">使用年份期限</span> <span class="label">使用月份期限</span>
<el-input <el-input
size="mini" size="mini"
v-model="addMsg.UseMonths" v-model="addMsg.UseMonths"
...@@ -479,7 +481,7 @@ ...@@ -479,7 +481,7 @@
</div> </div>
</div> </div>
<div class="btnformItem"> <div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')" <span v-loading="queryLoad" class="submitBtn" type="primary" @click="submitForm('addMsg')"
>确定</span >确定</span
> >
<span class="exitBtn" @click="dialogState = false">取消</span> <span class="exitBtn" @click="dialogState = false">取消</span>
...@@ -563,6 +565,7 @@ export default { ...@@ -563,6 +565,7 @@ export default {
}, },
data() { data() {
return { return {
queryLoad:false,
CheckDetailState: false, CheckDetailState: false,
total1: 0, total1: 0,
caozuoState: false, caozuoState: false,
...@@ -615,7 +618,11 @@ export default { ...@@ -615,7 +618,11 @@ export default {
StartTime: "", StartTime: "",
EndTime: "" EndTime: ""
}, },
pickerOptions: {
　　disabledDate(time) {
　　　　return time.getTime() < Date.now() - 24 * 60 * 60 * 1000
}
},
dialogtitle: "新增资产", dialogtitle: "新增资产",
dialogState: false, dialogState: false,
rules: { rules: {
...@@ -672,6 +679,7 @@ export default { ...@@ -672,6 +679,7 @@ export default {
EmployeeList2: [], EmployeeList2: [],
EmName: "", EmName: "",
PropertyId:'', PropertyId:'',
baseformItem:false,
}; };
}, },
mounted() { mounted() {
...@@ -812,6 +820,7 @@ export default { ...@@ -812,6 +820,7 @@ export default {
}; };
this.dialogtitle = "新增资产"; this.dialogtitle = "新增资产";
this.dialogState = true; this.dialogState = true;
this.baseformItem=false;
}, },
Edit(item) { Edit(item) {
this.dialogtitle = "编辑资产"; this.dialogtitle = "编辑资产";
...@@ -821,6 +830,7 @@ export default { ...@@ -821,6 +830,7 @@ export default {
this.addMsg.UseStatus = this.addMsg.UseStatus + ""; this.addMsg.UseStatus = this.addMsg.UseStatus + "";
this.EmName = item.EmName; this.EmName = item.EmName;
this.getEmployee(2); this.getEmployee(2);
this.baseformItem=true;
if (!this.addMsg.ImageList) { if (!this.addMsg.ImageList) {
this.addMsg.ImageList = []; this.addMsg.ImageList = [];
} }
...@@ -856,10 +866,12 @@ export default { ...@@ -856,10 +866,12 @@ export default {
if (valid) { if (valid) {
delete this.addMsg.UpdateBy; delete this.addMsg.UpdateBy;
delete this.addMsg.UpdateDate; delete this.addMsg.UpdateDate;
this.queryLoad=true;
this.apiJavaPost( this.apiJavaPost(
"/api/property/SetPropertyInfo", "/api/property/SetPropertyInfo",
this.addMsg, this.addMsg,
res => { res => {
this.queryLoad=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
this.Success(res.data.message); this.Success(res.data.message);
...@@ -911,7 +923,6 @@ export default { ...@@ -911,7 +923,6 @@ export default {
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.PropertyStatusList = res.data.data; this.PropertyStatusList = res.data.data;
console.log("this.PropertyStatusList",this.PropertyStatusList)
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/global/CheckDetails.vue
View file @ 85240dac
...@@ -19,13 +19,19 @@ ...@@ -19,13 +19,19 @@
</div> </div>
<div class="desItem"> <div class="desItem">
<p>领取时间</p> <p>领取时间</p>
<p>{{datainfo.GetTime}}</p> <p>
<span v-if="datainfo.GetTime && datainfo.GetTime!=''">{{datainfo.GetTime}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="baseTitle f12">基本信息</div> <div class="baseTitle f12">基本信息</div>
<div class="baseDiv"> <div class="baseDiv">
<div class="desItem"> <div class="desItem">
<p>资产名称</p> <p>资产名称</p>
<p>{{datainfo.Name}}</p> <p>
<span v-if="datainfo.Name && datainfo.Name!=''">{{datainfo.Name}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="desItem"> <div class="desItem">
<p>资产分类</p> <p>资产分类</p>
...@@ -36,7 +42,10 @@ ...@@ -36,7 +42,10 @@
</div> </div>
<div class="desItem"> <div class="desItem">
<p>品牌</p> <p>品牌</p>
<p>{{datainfo.BrandName}}</p> <p>
<span v-if="datainfo.BrandName && datainfo.BrandName!=''">{{datainfo.BrandName}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="desItem"> <div class="desItem">
<p>型号</p> <p>型号</p>
...@@ -61,11 +70,17 @@ ...@@ -61,11 +70,17 @@
</div> </div>
<div class="desItem"> <div class="desItem">
<p>购置日期</p> <p>购置日期</p>
<p>{{datainfo.BuyDate}}</p> <p>
<span v-if="datainfo.BuyDate && datainfo.BuyDate!=''">{{datainfo.BuyDate}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="desItem"> <div class="desItem">
<p>购置方式</p> <p>购置方式</p>
<p>{{datainfo.BuyTypeName}}</p> <p>
<span v-if="datainfo.BuyTypeName && datainfo.BuyTypeName!=''">{{datainfo.BuyTypeName}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="desItem"> <div class="desItem">
<p>金额</p> <p>金额</p>
...@@ -76,7 +91,10 @@ ...@@ -76,7 +91,10 @@
</div> </div>
<div class="desItem"> <div class="desItem">
<p>使用类型</p> <p>使用类型</p>
<p>{{datainfo.UseStatusName}}</p> <p>
<span v-if="datainfo.UseStatusName && datainfo.UseStatusName!=''">{{datainfo.UseStatusName}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="desItem"> <div class="desItem">
<p>公司</p> <p>公司</p>
...@@ -101,7 +119,7 @@ ...@@ -101,7 +119,7 @@
</div> </div>
</div> </div>
<div class="baseTitle f12">操作记录</div> <div class="baseTitle f12">操作记录</div>
<table class="myTable miniTable" border="0" cellspacing="0" cellpadding="0" > <table v-loading="detailLoad" class="myTable miniTable" border="0" cellspacing="0" cellpadding="0" >
<thead> <thead>
<th>类型</th> <th>类型</th>
<th>内容</th> <th>内容</th>
...@@ -161,6 +179,7 @@ export default { ...@@ -161,6 +179,7 @@ export default {
ImageList:[], ImageList:[],
}, },
PropertyId:'', PropertyId:'',
detailLoad:false,
} }
}, },
created(){ created(){
...@@ -181,11 +200,12 @@ export default { ...@@ -181,11 +200,12 @@ export default {
this.getOperation(); this.getOperation();
}, },
getOperation() { getOperation() {
this.detailLoad = true;
this.apiJavaPost( this.apiJavaPost(
"/api/property/GetPropertyLogPageList", "/api/property/GetPropertyLogPageList",
this.msg, this.msg,
res => { res => {
this.OperationLoad = false; this.detailLoad = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.OperationList = res.data.data.pageData; this.OperationList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
......
src/components/global/Nav.vue
View file @ 85240dac
...@@ -84,7 +84,8 @@ ...@@ -84,7 +84,8 @@
</div> </div>
</template> </template>
<el-menu-item-group class="itemgroup"> <el-menu-item-group class="itemgroup">
<el-menu-item @click="goUrl(child)" v-for="(child,childIndex) in item.ChildMenu" :key="childIndex" :index="String(index+1)+'-'+String(childIndex+1)"><span>{{child.MenuName}}</span></el-menu-item> <!-- :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-menu-item-group>
</el-submenu> </el-submenu>
...@@ -130,12 +131,14 @@ export default { ...@@ -130,12 +131,14 @@ export default {
this.$router.push({path: 'login'}) this.$router.push({path: 'login'})
return; return;
} }
this.$bus.on('once',(path,key) =>{//处理传过来的值
if(key){
this.defaulActive=key;
}
});
this.getMenu(); this.getMenu();
},
watch:{
$route(){
this.defaulActive=this.$route.path
},
}, },
methods:{ methods:{
goHome(){ goHome(){
...@@ -210,10 +213,10 @@ export default { ...@@ -210,10 +213,10 @@ export default {
.HeadNav .el-menu-item, .HeadNav .el-submenu__title{ .HeadNav .el-menu-item, .HeadNav .el-submenu__title{
height:34px; height:34px;
line-height:34px; line-height:34px;
margin-bottom:20px; margin-bottom:15px;
} }
.HeadNav .itemgroup{ .HeadNav .itemgroup{
margin-top: -30px; margin-top: -20px;
} }
.HeadNav .itemgroup .el-menu-item.is-active{ .HeadNav .itemgroup .el-menu-item.is-active{
color:#111111!important; color:#111111!important;
......
src/plugins/index.js
View file @ 85240dac
...@@ -13,10 +13,10 @@ export default { ...@@ -13,10 +13,10 @@ export default {
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
// var domainUrl = "http://test_reborn.oytour.com";//主域名 // var domainUrl = "http://test_reborn.oytour.com";//主域名
// var domainUrl = "http://reborn.oytour.com"; //主域名 // var domainUrl = "http://reborn.oytour.com"; //主域名
var domainUrl = "http://192.168.2.18:8083"; //主域名 var domainUrl = "http://192.168.2.17:8087"; //主域名
let locationName = window.location.hostname; let locationName = window.location.hostname;
let javaUrldo=""; let javaUrldo="";
javaUrldo=locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.16:8087"; javaUrldo=locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.17:8087";
if (this.isOnline()) { if (this.isOnline()) {
if (window.location.host.indexOf('testb2b.oytour.com') != -1) if (window.location.host.indexOf('testb2b.oytour.com') != -1)
domainUrl = "http://testapi.oytour.com" domainUrl = "http://testapi.oytour.com"
......
src/router/config.js
View file @ 85240dac
...@@ -90,13 +90,57 @@ export default { ...@@ -90,13 +90,57 @@ export default {
name: 'AssetDepreciation', name: 'AssetDepreciation',
component: resolve => require(['@/components/assetsman/AssetDepreciation'], resolve), component: resolve => require(['@/components/assetsman/AssetDepreciation'], resolve),
}, },
// 盘点管理
{
path: '/InventoryMan',
name: 'InventoryMan',
component: resolve => require(['@/components/assetsman/InventoryMan'], resolve),
},
// 盘点管理详情
{
path: '/InventoryDetails',
name: 'InventoryDetails',
component: resolve => require(['@/components/assetsman/InventoryDetails'], resolve),
},
// 盘点管理详情
{
path: '/disposalDetails',
name: 'disposalDetails',
component: resolve => require(['@/components/assetsman/disposalDetails'], resolve),
},
// 资产折旧报表 // 资产折旧报表
{ {
path: '/Assetstatistics', path: '/Assetstatistics',
name: 'Assetstatistics', name: 'Assetstatistics',
component: resolve => require(['@/components/assetsman/Assetstatistics'], resolve), component: resolve => require(['@/components/report/Assetstatistics'], resolve),
},
// 资产汇总查询
{
path: '/assetSummary',
name: 'assetSummary',
component: resolve => require(['@/components/report/assetSummary'], resolve),
},
// 资产履历
{
path: '/AssetsRecord',
name: 'AssetsRecord',
component: resolve => require(['@/components/report/AssetsRecord'], resolve),
},
// 待归还
{
path: '/StayBack',
name: 'StayBack',
component: resolve => require(['@/components/report/StayBack'], resolve),
},
// 到期资产
{
path: '/MaturingAssets',
name: 'MaturingAssets',
component: resolve => require(['@/components/report/MaturingAssets'], resolve),
}, },
// 物料仓库 // 物料仓库
{ {
path: '/Materialwarehouse', path: '/Materialwarehouse',
...@@ -157,8 +201,36 @@ export default { ...@@ -157,8 +201,36 @@ export default {
name: 'SignMan', name: 'SignMan',
component: resolve => require(['@/components/approval/SignMan'], resolve), component: resolve => require(['@/components/approval/SignMan'], resolve),
}, },
// 资产申请
{
path: '/assetsApply',
name: 'assetsApply',
component: resolve => require(['@/components/approval/assetsApply'], resolve),
},
// 我的资产
{
path: '/myAssets',
name: 'myAssets',
component: resolve => require(['@/components/approval/myAssets'], resolve),
},
// 资产清单
{
path: '/ListAssets',
name: 'ListAssets',
component: resolve => require(['@/components/approval/ListAssets'], resolve),
},
// 我的申请
{
path: '/Myapplication',
name: 'Myapplication',
component: resolve => require(['@/components/approval/Myapplication'], resolve),
},
// 耗材申请
{
path: '/ConsumApplication',
name: 'ConsumApplication',
component: resolve => require(['@/components/approval/ConsumApplication'], 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