Skip to content

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

111

parent ee9279ec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 415 additions and 71 deletions
package-lock.json
View file @ 2c701ccf
...@@ -14790,6 +14790,22 @@ ...@@ -14790,6 +14790,22 @@
"integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==", "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
"dev": true "dev": true
}, },
"v-viewer": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.5.1.tgz",
"integrity": "sha512-Q5ICKzmYQD0qTf+hti2Lhgy6UYY2zgFr+YrN9a3yPgr7pOjYrG405Pz4+6Z6FXlhdhGysCWFJUNCI2tsIyvjWQ==",
"requires": {
"throttle-debounce": "^2.0.1",
"viewerjs": "^1.5.0"
},
"dependencies": {
"throttle-debounce": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.1.0.tgz",
"integrity": "sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg=="
}
}
},
"validate-npm-package-license": { "validate-npm-package-license": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
...@@ -14823,6 +14839,11 @@ ...@@ -14823,6 +14839,11 @@
"extsprintf": "^1.2.0" "extsprintf": "^1.2.0"
} }
}, },
"viewerjs": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.5.0.tgz",
"integrity": "sha512-ZiJ0vrXDvomLSY3ixaZCJtmdenomsvPPQwZKwvtXUMCiO2HHtFGoB/KqpS9QzABSeKaRLfcENp1uRYJ7l1MkYQ=="
},
"vm-browserify": { "vm-browserify": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
......
package.json
View file @ 2c701ccf
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
"element-ui": "^2.13.0", "element-ui": "^2.13.0",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
"moment": "^2.24.0", "moment": "^2.24.0",
"v-viewer": "^1.5.1",
"vue": "^2.5.2", "vue": "^2.5.2",
"vue-bus": "^1.2.1", "vue-bus": "^1.2.1",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
......
src/App.vue
View file @ 2c701ccf
...@@ -13,7 +13,7 @@ export default { ...@@ -13,7 +13,7 @@ export default {
</script> </script>
<style> <style>
@import "//at.alicdn.com/t/font_1544586_83779r3l1dg.css"; @import "//at.alicdn.com/t/font_1544586_n4jd8ww9mz.css";
@import "./assets/css/common.css"; @import "./assets/css/common.css";
body,html{ body,html{
padding: 0px; padding: 0px;
......
src/assets/css/common.css
View file @ 2c701ccf
...@@ -245,3 +245,53 @@ ...@@ -245,3 +245,53 @@
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.dialogul{
position: relative;
left: 0;
}
.dialogul li{
display: inline-block;
min-width: 204px;
height: 50px;
line-height: 50px;
background: rgba(255,255,255,1);
-webkit-box-shadow: 0px 6px 14px 0px rgba(176,176,176,0.1);
box-shadow: 0px 6px 14px 0px rgba(176,176,176,0.1);
border-radius: 10px;
margin-right: 20px;
margin-bottom: 20px;
}
.dialogul li .el-input__inner {
border: none!important;
outline: none!important;
color: #111111;
padding-left:15px!important;
}
.text1{
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.text2{
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.text3{
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
.text4{
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 4;
-webkit-box-orient: vertical;
}
\ No newline at end of file
src/assets/css/reset.css
View file @ 2c701ccf
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
border: none; border: none;
outline: none; outline: none;
color:#111111; color:#111111;
font-family: "宋体";
} }
/* 分页 */ /* 分页 */
.el-pagination{ .el-pagination{
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
/* dialog */ /* dialog */
.el-dialog__body{ .el-dialog__body{
padding:20px; padding:0 20px 15px 20px;
} }
.el-dialog{ .el-dialog{
background:rgba(248,250,251,1); background:rgba(248,250,251,1);
...@@ -154,6 +155,11 @@ ...@@ -154,6 +155,11 @@
.queryul li .vue-treeselect__placeholder{ .queryul li .vue-treeselect__placeholder{
line-height: 50px; line-height: 50px;
} }
.vue-treeselect__placeholder{
color:#111111;
font-size: 12px;
font-family: "宋体";
}
.queryul li .vue-treeselect__single-value{ .queryul li .vue-treeselect__single-value{
line-height: 50px; line-height: 50px;
} }
...@@ -221,7 +227,6 @@ ...@@ -221,7 +227,6 @@
background:rgba(255,255,255,1); background:rgba(255,255,255,1);
box-shadow:0px 6px 14px 0px rgba(176,176,176,0.1); box-shadow:0px 6px 14px 0px rgba(176,176,176,0.1);
border-radius:10px; border-radius:10px;
margin-top:6px;
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -246,6 +251,7 @@ ...@@ -246,6 +251,7 @@
.uploadUl li img{ .uploadUl li img{
width: 100%; width: 100%;
border-radius:10px; border-radius:10px;
height:100%;
} }
.uploadUl li .hoverDiv{ .uploadUl li .hoverDiv{
position: absolute; position: absolute;
...@@ -263,7 +269,8 @@ ...@@ -263,7 +269,8 @@
.uploadUl li .hoverDiv img{ .uploadUl li .hoverDiv img{
margin-top:50px; margin-top:50px;
width:32px!important;min-height:32px!important; width:32px!important;
height:32px!important;
cursor: pointer; cursor: pointer;
} }
/* select */ /* select */
...@@ -304,4 +311,29 @@ ...@@ -304,4 +311,29 @@
/* loading */ /* loading */
.el-loading-spinner .path{ .el-loading-spinner .path{
stroke: #28CACC; stroke: #28CACC;
}
.vue-treeselect__checkbox--checked{
border-color: #28CACC!important;
background: #28CACC!important;
}
.vue-treeselect__label-container:hover .vue-treeselect__checkbox--checked{
border-color: #28CACC!important;
background: #28CACC!important;
}
.vue-treeselect__multi-value-item{
color:#606266!important;
}
.vue-treeselect__value-remove{
color: #28CACC!important;
}
.vue-treeselect__label-container:hover .vue-treeselect__checkbox--indeterminate{
border-color: #fff!important;
background: #28CACC!important;
}
.vue-treeselect__checkbox--indeterminate{
border-color: #28CACC!important;
background: #28CACC!important;
}
.el-tooltip{
cursor: pointer;
} }
\ No newline at end of file
src/components/Materialman/Archivesmaterials.vue
View file @ 2c701ccf
<template> <template>
<div class="Archivesmaterials"> <div class="Archivesmaterials">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px"> <div 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>
<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="">
......
src/components/Materialman/SpotQuery.vue
View file @ 2c701ccf
...@@ -171,7 +171,6 @@ export default { ...@@ -171,7 +171,6 @@ export default {
<style scoped> <style scoped>
.spotquery{ .spotquery{
padding:20px 30px;
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB; background: #F8FAFB;
} }
......
src/components/approval/SignMan.vue
View file @ 2c701ccf
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
:normalizer="normalizer" /> :normalizer="normalizer" />
</li> </li>
<li> <li>
<el-input class="w200" size="small" v-model="msg.OrderCode" placeholder="派发单编号"></el-input> <el-input class="w200" size="small" v-model="msg.OrderCode" placeholder="编号"></el-input>
</li> </li>
<li> <li>
<el-input class="w200" size="small" v-model="msg.PropertyNum" placeholder="资产编码"></el-input> <el-input class="w200" size="small" v-model="msg.PropertyNum" placeholder="资产编码"></el-input>
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1050px"> <el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
</div> </div>
...@@ -450,7 +450,6 @@ export default { ...@@ -450,7 +450,6 @@ export default {
<style scoped> <style scoped>
.spotquery{ .spotquery{
padding:20px 30px;
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB; background: #F8FAFB;
......
src/components/approval/approvalDetails.vue
View file @ 2c701ccf
This diff is collapsed.
src/components/approval/approvalMan.vue
View file @ 2c701ccf
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
:normalizer="normalizer" /> :normalizer="normalizer" />
</li> </li>
<li> <li>
<el-input class="w200" size="small" v-model="msg.OrderCode" placeholder="派发单编号"></el-input> <el-input class="w200" size="small" v-model="msg.OrderCode" placeholder="编号"></el-input>
</li> </li>
<li> <li>
<el-input class="w200" size="small" v-model="msg.PropertyNum" placeholder="资产编码"></el-input> <el-input class="w200" size="small" v-model="msg.PropertyNum" placeholder="资产编码"></el-input>
...@@ -164,12 +164,12 @@ ...@@ -164,12 +164,12 @@
<span class="label">转交人</span> <span class="label">转交人</span>
<el-select filterable size="small" v-model="addMsg.AuditEmId" placeholder="转交人" :filter-method="getEmployee2"> <el-select filterable size="small" v-model="addMsg.AuditEmId" placeholder="转交人" :filter-method="getEmployee2">
<el-option <el-option
v-for="item in EmployeeList2" v-for="item in EmployeeList2"
:key="item.EmployeeId" :key="item.EmployeeId"
:label="item.EmName" :label="item.EmName"
:value="item.EmployeeId"> :value="item.EmployeeId">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<span class="label">备注</span> <span class="label">备注</span>
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1050px"> <el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
</div> </div>
...@@ -471,7 +471,6 @@ export default { ...@@ -471,7 +471,6 @@ export default {
<style scoped> <style scoped>
.spotquery{ .spotquery{
padding:20px 30px;
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB; background: #F8FAFB;
......
src/components/approval/approvalset.vue
View file @ 2c701ccf
...@@ -199,7 +199,6 @@ export default { ...@@ -199,7 +199,6 @@ export default {
<style scoped> <style scoped>
.spotquery{ .spotquery{
padding:20px 30px;
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB; background: #F8FAFB;
} }
......
src/components/assetsman/LendReturn.vue
View file @ 2c701ccf
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
:normalizer="normalizer" /> :normalizer="normalizer" />
</li> </li>
<li> <li>
<el-input class="w200" size="small" v-model="msg.OrderCode" placeholder="派发单编号"></el-input> <el-input class="w200" size="small" v-model="msg.OrderCode" placeholder="编号"></el-input>
</li> </li>
<li> <li>
<el-input class="w200" size="small" v-model="msg.PropertyNum" placeholder="资产编码"></el-input> <el-input class="w200" size="small" v-model="msg.PropertyNum" placeholder="资产编码"></el-input>
...@@ -114,9 +114,9 @@ ...@@ -114,9 +114,9 @@
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<img v-if="(item.AuditStatus==3 || item.AuditStatus==5) && item.CreateBy==EmployeeId" @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt=""> <img v-if="(item.AuditStatus==3 || item.AuditStatus==5) && item.CreateBy==EmployeeId" @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.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 v-if="item.AuditStatus==2 && item.CreateBy==EmployeeId" @click="End(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt=""> <img v-if="item.AuditStatus==2 && item.CreateBy==EmployeeId" @click="End(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.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 v-if="item.TempleteId>0" @click="See(item,'approvalDetails','LendReturn','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt=""> <img v-if="item.TempleteId>0" @click="See(item,'approvalDetails','LendReturn','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
</el-tooltip> </el-tooltip>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
:normalizer="normalizer" /> :normalizer="normalizer" />
</li> </li>
<li> <li>
<el-input class="w200" size="small" v-model="tuimsg.OrderCode" placeholder="派发单编号"></el-input> <el-input class="w200" size="small" v-model="tuimsg.OrderCode" placeholder="编号"></el-input>
</li> </li>
<li> <li>
<el-input class="w200" size="small" v-model="tuimsg.PropertyNum" placeholder="资产编码"></el-input> <el-input class="w200" size="small" v-model="tuimsg.PropertyNum" placeholder="资产编码"></el-input>
...@@ -228,9 +228,9 @@ ...@@ -228,9 +228,9 @@
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<img v-if="item.AuditStatus==3 || item.AuditStatus==5" @click="DeleteTuiku(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt=""> <img v-if="item.AuditStatus==3 || item.AuditStatus==5" @click="DeleteTuiku(item)" style="width:24px;height:24px" src="../../assets/img/delete.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 v-if="item.AuditStatus==2" @click="EndTuiku(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt=""> <img v-if="item.AuditStatus==2" @click="EndTuiku(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.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 v-if="item.TempleteId>0" @click="See(item,'approvalDetails','LendReturn','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt=""> <img v-if="item.TempleteId>0" @click="See(item,'approvalDetails','LendReturn','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
</el-tooltip> </el-tooltip>
...@@ -440,6 +440,35 @@ ...@@ -440,6 +440,35 @@
width="750px"> width="750px">
<el-form class="MyEditForm" :model="addMsg" label-width="0px"> <el-form class="MyEditForm" :model="addMsg" label-width="0px">
<div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px">
<ul class="dialogul">
<li>
<el-input
class="w200"
size="small"
v-model="zichanmsg.Name"
placeholder="资产名称"
></el-input>
</li>
<li>
<el-input
class="w200"
size="small"
v-model="zichanmsg.PropertyNum"
placeholder="资产编码"
></el-input>
</li>
<li>
<el-select filterable size="small" v-model="zichanmsg.BranchId" placeholder="公司">
<el-option label="不限" :value="-1"></el-option>
<el-option
v-for="item in BranchList"
:key="item.Id"
:label="item.BName"
:value="item.Id">
</el-option>
</el-select>
</li>
</ul>
<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>
...@@ -480,7 +509,7 @@ ...@@ -480,7 +509,7 @@
<el-pagination <el-pagination
@current-change="currentChange1" @current-change="currentChange1"
background background
:page-size="wuliaomsg.pageSize" :page-size="zichanmsg.pageSize"
layout="prev, pager, next" layout="prev, pager, next"
:total="wuliaototal"> :total="wuliaototal">
</el-pagination> </el-pagination>
...@@ -490,7 +519,7 @@ ...@@ -490,7 +519,7 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1050px"> <el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
</div> </div>
...@@ -624,6 +653,7 @@ export default { ...@@ -624,6 +653,7 @@ export default {
SupplierId:'', SupplierId:'',
StartTime:'', StartTime:'',
EndTime:'', EndTime:'',
BranchId:-1,
}, },
zctotal:0, zctotal:0,
zctableData:[], zctableData:[],
...@@ -643,6 +673,7 @@ export default { ...@@ -643,6 +673,7 @@ export default {
BackETime:'', BackETime:'',
}, },
PropertyId:'', PropertyId:'',
BranchList:[],
} }
}, },
...@@ -656,9 +687,22 @@ export default { ...@@ -656,9 +687,22 @@ export default {
this.getList(); this.getList();
this.getNode(); this.getNode();
this.getStateEnum(); this.getStateEnum();
this.getBranch();
}, },
methods:{ methods:{
getBranch(){
this.apiJavaPost("/api/User/GetBranchList",{},
res => {
if (res.data.resultCode === 1) {
this.BranchList=res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
getCheckDes(item){ getCheckDes(item){
this.PropertyId=item.PropertyId; this.PropertyId=item.PropertyId;
this.CheckDetailState=true; this.CheckDetailState=true;
......
src/components/assetsman/PaiTui.vue
View file @ 2c701ccf
...@@ -225,9 +225,9 @@ ...@@ -225,9 +225,9 @@
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<img v-if="item.AuditStatus==3 || item.AuditStatus==5" @click="DeleteTuiku(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt=""> <img v-if="item.AuditStatus==3 || item.AuditStatus==5" @click="DeleteTuiku(item)" style="width:24px;height:24px" src="../../assets/img/delete.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 v-if="item.AuditStatus==2" @click="EndTuiku(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt=""> <img v-if="item.AuditStatus==2" @click="EndTuiku(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.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 v-if="item.TempleteId>0" @click="See(item,'approvalDetails','PaiTui','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt=""> <img v-if="item.TempleteId>0" @click="See(item,'approvalDetails','PaiTui','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
</el-tooltip> </el-tooltip>
...@@ -438,6 +438,35 @@ ...@@ -438,6 +438,35 @@
width="750px"> width="750px">
<el-form class="MyEditForm" :model="addMsg" label-width="0px"> <el-form class="MyEditForm" :model="addMsg" label-width="0px">
<div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px">
<ul class="dialogul">
<li>
<el-input
class="w200"
size="small"
v-model="zichanmsg.Name"
placeholder="资产名称"
></el-input>
</li>
<li>
<el-input
class="w200"
size="small"
v-model="zichanmsg.PropertyNum"
placeholder="资产编码"
></el-input>
</li>
<li>
<el-select filterable size="small" v-model="zichanmsg.BranchId" placeholder="公司">
<el-option label="不限" :value="-1"></el-option>
<el-option
v-for="item in BranchList"
:key="item.Id"
:label="item.BName"
:value="item.Id">
</el-option>
</el-select>
</li>
</ul>
<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>
...@@ -478,7 +507,7 @@ ...@@ -478,7 +507,7 @@
<el-pagination <el-pagination
@current-change="currentChange1" @current-change="currentChange1"
background background
:page-size="wuliaomsg.pageSize" :page-size="zichanmsg.pageSize"
layout="prev, pager, next" layout="prev, pager, next"
:total="wuliaototal"> :total="wuliaototal">
</el-pagination> </el-pagination>
...@@ -488,7 +517,7 @@ ...@@ -488,7 +517,7 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1050px"> <el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
</div> </div>
...@@ -621,6 +650,7 @@ export default { ...@@ -621,6 +650,7 @@ export default {
SupplierId:'', SupplierId:'',
StartTime:'', StartTime:'',
EndTime:'', EndTime:'',
BranchId:-1,
}, },
zctotal:0, zctotal:0,
zctableData:[], zctableData:[],
...@@ -638,8 +668,10 @@ export default { ...@@ -638,8 +668,10 @@ export default {
EmployeeId:'', EmployeeId:'',
BackSTime:'', BackSTime:'',
BackETime:'', BackETime:'',
BranchId:-1,
}, },
PropertyId:'', PropertyId:'',
BranchList:[],
} }
}, },
...@@ -653,9 +685,22 @@ export default { ...@@ -653,9 +685,22 @@ export default {
this.getList(); this.getList();
this.getNode(); this.getNode();
this.getStateEnum(); this.getStateEnum();
this.getBranch();
}, },
methods:{ methods:{
getBranch(){
this.apiJavaPost("/api/User/GetBranchList",{},
res => {
if (res.data.resultCode === 1) {
this.BranchList=res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
getCheckDes(item){ getCheckDes(item){
this.PropertyId=item.PropertyId; this.PropertyId=item.PropertyId;
this.CheckDetailState=true; this.CheckDetailState=true;
......
src/components/assetsman/assetsList.vue
View file @ 2c701ccf
...@@ -545,7 +545,7 @@ ...@@ -545,7 +545,7 @@
</el-pagination> </el-pagination>
</el-dialog> </el-dialog>
<!-- --> <!-- -->
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1050px"> <el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
</div> </div>
......
src/components/global/CheckDetails.vue
View file @ 2c701ccf
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<img style="width:100%;" :src="item" alt=""> <img style="width:100%;" :src="item" alt="">
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
<img v-else style="width:100%;height:500px" src="../../assets/img/noimg.png" alt=""> <img v-else style="width:100%;height:500px;border: 1px solid #ccc;" src="../../assets/img/noimg.png" alt="">
</div> </div>
<div class="right overflowY" style="height:500px"> <div class="right overflowY" style="height:500px">
<div class="baseTitle f12">使用信息</div> <div class="baseTitle f12">使用信息</div>
...@@ -223,9 +223,9 @@ export default { ...@@ -223,9 +223,9 @@ export default {
font-size: 12px; font-size: 12px;
} }
.CheckDetails .left{ .CheckDetails .left{
border: 1px solid #ccc; width:440px;
width:340px;
box-sizing: border-box; box-sizing: border-box;
padding:25px;
} }
.CheckDetails .right{ .CheckDetails .right{
width: 660px; width: 660px;
......
src/components/global/Nav.vue
View file @ 2c701ccf
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
data(){ data(){
return{ return{
fontPub: "iconfont", fontPub: "iconfont",
idonfontList:['icon-zichanguanli','icon-shu','icon-xitong','icon-shenpi'], idonfontList:['icon-zichanguanli','icon-shu','icon-xitong','icon-shenpi','icon-shuju'],
defaulActive:'0', defaulActive:'0',
route:{ route:{
'0':'/home', '0':'/home',
......
src/main.js
View file @ 2c701ccf
...@@ -27,7 +27,13 @@ Vue.http = Vue.prototype.$http = axios ...@@ -27,7 +27,13 @@ Vue.http = Vue.prototype.$http = axios
import VueBus from 'vue-bus'; import VueBus from 'vue-bus';
Vue.use(VueBus); Vue.use(VueBus);
import 'viewerjs/dist/viewer.css'
import Viewer from 'v-viewer'
Vue.use(Viewer,{
defaultOptions: {
zIndex: 9999
}
})
Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
......
src/plugins/index.js
View file @ 2c701ccf
...@@ -15,6 +15,8 @@ export default { ...@@ -15,6 +15,8 @@ export default {
// 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.18:8083"; //主域名
let locationName = window.location.hostname; let locationName = window.location.hostname;
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";
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"
...@@ -34,6 +36,7 @@ export default { ...@@ -34,6 +36,7 @@ export default {
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120",
// UploadUrl: "http://uploadfile.oytour.com", // UploadUrl: "http://uploadfile.oytour.com",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi", LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
JavaLocalFileStreamDownLoadUrl: javaUrldo,
}; };
return obj; return obj;
}, },
...@@ -63,6 +66,7 @@ export default { ...@@ -63,6 +66,7 @@ export default {
this.$http.post(apiurl, postData, { this.$http.post(apiurl, postData, {
responseType: 'arraybuffer' responseType: 'arraybuffer'
}).then((res) => { }).then((res) => {
console.log("res",res);
let blob = new Blob([res.data], { let blob = new Blob([res.data], {
type: "application/vnd.ms-excel" type: "application/vnd.ms-excel"
}) })
...@@ -75,6 +79,57 @@ export default { ...@@ -75,6 +79,57 @@ export default {
successCall(res); successCall(res);
}).catch(function (res) {}); }).catch(function (res) {});
}, },
Vue.prototype.JavaGetLocalFile = function (cmd, msg, fileName, successCall) {
var apiurl = this.domainManager().JavaLocalFileStreamDownLoadUrl + cmd;
var timestamp = (new Date()).valueOf();
if (!localStorage.zcuserInfo && localStorage.zcuserInfo != "" && this.$route.path.toLowerCase() != "/login") {
this.$router.push({
path: '/login'
})
}
var token = "";
var key = "";
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey;
}
let zcuserInfo = localStorage.zcuserInfo ? JSON.parse(localStorage.zcuserInfo) : '';
let groupId = zcuserInfo.RB_Group_id ? zcuserInfo.RB_Group_id : 0;
let uid = zcuserInfo.EmployeeId ? zcuserInfo.EmployeeId : 0;
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
// var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var md5Str = md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = {
"msg": msg,
"timestamp": timestamp,
"token": token,
"sign": md5Str,
"uid": uid,
"groupId": groupId
}
// var postData = {
// "msg": msg,
// "cmd": cmd,
// "timestamp": timestamp,
// "token": token,
// "sign": md5Str
// }
this.$http.post(apiurl, postData, {
responseType: 'arraybuffer'
}).then((res) => {
console.log("res",res);
let blob = new Blob([res.data], {
type: "application/vnd.ms-excel"
})
let url = URL.createObjectURL(blob);
let link = document.createElement('a');
link.href = url;
link.setAttribute("download", fileName);
document.body.appendChild(link);
link.click();
successCall(res);
}).catch(function (res) {});
},
//价钱格式化，三位数逗号分隔，保留两位小数 duanjun //价钱格式化，三位数逗号分隔，保留两位小数 duanjun
Vue.prototype.moneyFormat = function (value) { Vue.prototype.moneyFormat = function (value) {
let nStr = Number(value).toFixed(2) let nStr = Number(value).toFixed(2)
......
src/router/config.js
View file @ 2c701ccf
...@@ -66,6 +66,37 @@ export default { ...@@ -66,6 +66,37 @@ export default {
component: resolve => require(['@/components/assetsman/LendReturn'], resolve), component: resolve => require(['@/components/assetsman/LendReturn'], resolve),
}, },
// 调拨管理
{
path: '/allocatingMan',
name: 'allocatingMan',
component: resolve => require(['@/components/assetsman/allocatingMan'], resolve),
},
// 处置管理
{
path: '/disposalMan',
name: 'disposalMan',
component: resolve => require(['@/components/assetsman/disposalMan'], resolve),
},
// 维修管理
{
path: '/maintenance',
name: 'maintenance',
component: resolve => require(['@/components/assetsman/maintenance'], resolve),
},
// 资产折旧
{
path: '/AssetDepreciation',
name: 'AssetDepreciation',
component: resolve => require(['@/components/assetsman/AssetDepreciation'], resolve),
},
// 资产折旧报表
{
path: '/Assetstatistics',
name: 'Assetstatistics',
component: resolve => require(['@/components/assetsman/Assetstatistics'], resolve),
},
// 物料仓库 // 物料仓库
{ {
path: '/Materialwarehouse', path: '/Materialwarehouse',
......
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