Skip to content

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

11

parent ad0e4a65
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1065 additions and 66 deletions
package-lock.json
View file @ 38272837
...@@ -14834,6 +14834,11 @@ ...@@ -14834,6 +14834,11 @@
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
"integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==" "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
}, },
"vue-bus": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/vue-bus/-/vue-bus-1.2.1.tgz",
"integrity": "sha512-uCSJEWFWoDZz+GV/Pj/wXAC7WVBLD18V62l+2ezd4UCsZWZB27Hz3K0M9WUcbNum/yKBoN+OkOCIrU6A9xqWhw=="
},
"vue-hot-reload-api": { "vue-hot-reload-api": {
"version": "2.3.4", "version": "2.3.4",
"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
......
package.json
View file @ 38272837
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
"moment": "^2.24.0", "moment": "^2.24.0",
"vue": "^2.5.2", "vue": "^2.5.2",
"vue-bus": "^1.2.1",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vxe-table": "^2.6.22", "vxe-table": "^2.6.22",
"xe-utils": "^2.2.15" "xe-utils": "^2.2.15"
......
src/assets/utils/commonUtils.js 0 → 100644
View file @ 38272837
This diff is collapsed.
src/components/Materialman/Archivesmaterials.vue
View file @ 38272837
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
</ul> </ul>
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> <table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th>档案编码</th>
<th>物料档案名称</th> <th>物料档案名称</th>
<th>分类名称</th> <th>分类名称</th>
<th>品牌名</th> <th>品牌名</th>
...@@ -31,7 +32,6 @@ ...@@ -31,7 +32,6 @@
<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>
...@@ -41,8 +41,9 @@ ...@@ -41,8 +41,9 @@
<tr v-for="(item,index) in tableData" :key="index"> <tr v-for="(item,index) in tableData" :key="index">
<td> <td>
<span class="commonStyle hoverSpan1"></span> <span class="commonStyle hoverSpan1"></span>
{{item.Name}} {{item.SuppliesNum}}
</td> </td>
<td>{{item.Name}}</td>
<td>{{item.CategoryName}}</td> <td>{{item.CategoryName}}</td>
<td>{{item.BrandName}}</td> <td>{{item.BrandName}}</td>
<td>{{item.Money}}</td> <td>{{item.Money}}</td>
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
<div>安全库存：{{item.SafetyStock}}</div> <div>安全库存：{{item.SafetyStock}}</div>
</td> </td>
<td>{{item.SuppliesModel}}</td> <td>{{item.SuppliesModel}}</td>
<td>{{item.SuppliesNum}}</td>
<!-- <td> <!-- <td>
<img v-for="(subItem,index) in item.ImageList" :key="index" :src="subItem" alt=""> <img v-for="(subItem,index) in item.ImageList" :key="index" :src="subItem" alt="">
</td> --> </td> -->
...@@ -369,7 +370,6 @@ export default { ...@@ -369,7 +370,6 @@ export default {
this.dialogtitle="编辑物料档案"; this.dialogtitle="编辑物料档案";
this.dialogState=true; this.dialogState=true;
this.addMsg=Object.assign({},item) this.addMsg=Object.assign({},item)
console.log(item,'itemmm');
if(!this.addMsg.ImageList){ if(!this.addMsg.ImageList){
this.addMsg.ImageList=[]; this.addMsg.ImageList=[];
} }
...@@ -402,7 +402,6 @@ export default { ...@@ -402,7 +402,6 @@ export default {
}); });
}, },
treeClick(data){ treeClick(data){
console.log("data",data)
}, },
getNode(){ getNode(){
this.apiJavaPost("/api/property/CateporyGetTreeList",this.nodemsg, this.apiJavaPost("/api/property/CateporyGetTreeList",this.nodemsg,
......
src/components/Materialman/ConsumRecipients.vue
View file @ 38272837
...@@ -194,7 +194,6 @@ export default { ...@@ -194,7 +194,6 @@ export default {
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.departmentata=res.data.data; this.departmentata=res.data.data;
console.log("this.departmentata",this.departmentata)
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -257,7 +256,6 @@ export default { ...@@ -257,7 +256,6 @@ export default {
res => { res => {
this.loading=false; this.loading=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
console.log("res",res);
let data=res.data.data; let data=res.data.data;
this.tableData=data.pagelist.pageData; this.tableData=data.pagelist.pageData;
this.total=data.pagelist.count; this.total=data.pagelist.count;
......
src/components/Materialman/Materialwarehouse.vue
View file @ 38272837
...@@ -146,7 +146,6 @@ export default { ...@@ -146,7 +146,6 @@ export default {
res => { res => {
this.loading=false; this.loading=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
console.log("res",res);
this.tableData=res.data.data.pageData; this.tableData=res.data.data.pageData;
this.total=res.data.data.count; this.total=res.data.data.count;
} else { } else {
......
src/components/Materialman/SpotQuery.vue
View file @ 38272837
...@@ -39,10 +39,10 @@ ...@@ -39,10 +39,10 @@
<vxe-table style="margin-top:15px" :loading="loading" <vxe-table style="margin-top:15px" :loading="loading"
:data="tableData"> :data="tableData">
<vxe-table-column field="SuppliesNum" title="耗材编码"></vxe-table-column> <vxe-table-column field="SuppliesNum" title="耗材编码"></vxe-table-column>
<vxe-table-column field="WareHouseName" title="仓库名称"></vxe-table-column>
<vxe-table-column field="SuppliesName" title="耗材名称"></vxe-table-column> <vxe-table-column field="SuppliesName" title="耗材名称"></vxe-table-column>
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column> <vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
<vxe-table-column field="SuppliesModel" title="耗材型号"></vxe-table-column> <vxe-table-column field="SuppliesModel" title="耗材型号"></vxe-table-column>
<vxe-table-column field="WareHouseName" title="仓库名称"></vxe-table-column>
<vxe-table-column field="BrandName" title="品牌"></vxe-table-column> <vxe-table-column field="BrandName" title="品牌"></vxe-table-column>
<vxe-table-column field="Units" title="单位"></vxe-table-column> <vxe-table-column field="Units" title="单位"></vxe-table-column>
<vxe-table-column field="SafetyStock" title="安全库存"></vxe-table-column> <vxe-table-column field="SafetyStock" title="安全库存"></vxe-table-column>
...@@ -153,7 +153,6 @@ export default { ...@@ -153,7 +153,6 @@ export default {
res => { res => {
this.loading=false; this.loading=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
console.log("res",res);
this.tableData=res.data.data.pageData; this.tableData=res.data.data.pageData;
this.total=res.data.data.count; this.total=res.data.data.count;
} else { } else {
......
src/components/Materialman/chukudan.vue
View file @ 38272837
...@@ -66,12 +66,12 @@ ...@@ -66,12 +66,12 @@
<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 width="150px">操作</th> <th width="150px">操作</th>
</thead> </thead>
<tbody> <tbody>
...@@ -86,12 +86,13 @@ ...@@ -86,12 +86,13 @@
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutNum}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutNum}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td>
<!-- <td :rowspan="item.DetailList.length" v-if="index==0">{{item.SupplierName}}</td> --> <!-- <td :rowspan="item.DetailList.length" v-if="index==0">{{item.SupplierName}}</td> -->
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutDate}}</td>
<td>{{delist.CategoryName}}</td> <td>{{delist.CategoryName}}</td>
<td>{{delist.SuppliesName}}</td> <td>{{delist.SuppliesName}}</td>
<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.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">
......
src/components/Materialman/rukudan.vue
View file @ 38272837
...@@ -55,13 +55,13 @@ ...@@ -55,13 +55,13 @@
<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 width="150px">操作</th> <th width="150px">操作</th>
</thead> </thead>
<tbody> <tbody>
...@@ -75,14 +75,14 @@ ...@@ -75,14 +75,14 @@
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInNum}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInNum}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.SupplierName}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.SupplierName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInDate}}</td>
<td>{{delist.CategoryName}}</td> <td>{{delist.CategoryName}}</td>
<td>{{delist.SuppliesName}}</td> <td>{{delist.SuppliesName}}</td>
<td>{{delist.BrandName}}</td> <td>{{delist.BrandName}}</td>
<td>{{delist.UnitPrice}}</td> <td>{{delist.UnitPrice}}</td>
<td>{{delist.Money}}</td> <td>{{delist.Money}}</td>
<td>{{delist.Number}}</td> <td>{{delist.Number}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInDate}}</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">
......
src/components/Systemman/AssetsClassification.vue
View file @ 38272837
...@@ -344,11 +344,7 @@ export default { ...@@ -344,11 +344,7 @@ export default {
); );
}, },
Nodeclick(obj,node){ Nodeclick(obj,node){
// console.log("obj",obj)
// this.msg.Name=obj.Name;
// this.msg.Tier=obj.Tier;
// this.msg.ParentId=obj.ParentId;
// this.getList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
......
src/components/Systemman/MaterialClassification.vue
View file @ 38272837
...@@ -224,7 +224,6 @@ export default { ...@@ -224,7 +224,6 @@ export default {
this.addMsg.Tier=data.Tier; this.addMsg.Tier=data.Tier;
this.addMsg.Sort=data.Sort; this.addMsg.Sort=data.Sort;
this.getflList(data.Tier) this.getflList(data.Tier)
console.log("this.addMsg",this.addMsg)
}, },
DeleteNode(node,data){ DeleteNode(node,data){
this.Delete(node); this.Delete(node);
...@@ -347,11 +346,7 @@ export default { ...@@ -347,11 +346,7 @@ export default {
); );
}, },
Nodeclick(obj,node){ Nodeclick(obj,node){
// console.log("obj",obj)
// this.msg.Name=obj.Name;
// this.msg.Tier=obj.Tier;
// this.msg.ParentId=obj.ParentId;
// this.getList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
......
src/components/Systemman/Supplierman.vue
View file @ 38272837
...@@ -201,7 +201,6 @@ export default { ...@@ -201,7 +201,6 @@ export default {
res => { res => {
this.loading=false; this.loading=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
console.log("res",res);
this.tableData=res.data.data.pageData; this.tableData=res.data.data.pageData;
this.total=res.data.data.count; this.total=res.data.data.count;
} else { } else {
......
src/components/approval/Sign.vue 0 → 100644
View file @ 38272837
<template>
<div class="Sign">
<section class="signature">
<div class="signatureBox">
<div class="canvasBox" ref="canvasHW">
<canvas ref="canvasF" @touchstart='touchStart' @touchmove='touchMove' @touchend='touchEnd' @mousedown="mouseDown" @mousemove="mouseMove" @mouseup="mouseUp"></canvas>
<div class="btnBox">
<div @click="overwrite">重写</div>
<div @click="commit">提交签名</div>
</div>
</div>
</div>
<img class="imgCanvas" :src="imgUrl">
</section>
</div>
</template>
<script>
export default {
name: 'Sign',
data(){
return{
dialogVisible:true,
imgSrc:'',
stageInfo:'',
imgUrl:'',
client: {},
points: [],
canvasTxt: null,
startX: 0,
startY: 0,
moveY: 0,
moveX: 0,
endY: 0,
endX: 0,
w: null,
h: null,
isDown: false,
isViewAutograph: this.$route.query.isViews > 0,
contractSuccess: this.$route.query.contractSuccess
}
},
mounted(){
let canvas = this.$refs.canvasF
canvas.height = this.$refs.canvasHW.offsetHeight - 500
canvas.width = this.$refs.canvasHW.offsetWidth - 50
this.canvasTxt = canvas.getContext('2d')
this.stageInfo = canvas.getBoundingClientRect()
},
methods:{
mouseDown(ev) {
ev = ev || event
ev.preventDefault()
if (1) {
let obj = {
x: ev.offsetX,
y: ev.offsetY
}
this.startX = obj.x
this.startY = obj.y
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.points.push(obj)
this.isDown = true
}
},
mouseMove(ev) {
ev = ev || event
ev.preventDefault()
if (this.isDown) {
let obj = {
x: ev.offsetX,
y: ev.offsetY
}
this.moveY = obj.y
this.moveX = obj.x
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.startY = obj.y
this.startX = obj.x
this.points.push(obj)
}
},
mouseUp(ev) {
ev = ev || event
ev.preventDefault()
if (1) {
let obj = {
x: ev.offsetX,
y: ev.offsetY
}
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.points.push(obj)
this.points.push({x: -1, y: -1})
this.isDown = false
}
},
//重写
overwrite() {
this.canvasTxt.clearRect(0, 0, this.$refs.canvasF.width, this.$refs.canvasF.height)
this.points = []
},
//提交签名
commit() {
this.imgUrl=this.$refs.canvasF.toDataURL();
console.log(this.$refs.canvasF.toDataURL()) //签名img回传后台
},
//mobile
touchStart(ev) {
ev = ev || event
ev.preventDefault()
if (ev.touches.length == 1) {
let obj = {
x: ev.targetTouches[0].clienX,
y: ev.targetTouches[0].clientY,
}
this.startX = obj.x
this.startY = obj.y
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.points.push(obj)
}
},
touchMove(ev) {
ev = ev || event
ev.preventDefault()
if (ev.touches.length == 1) {
let obj = {
x: ev.targetTouches[0].clientX - this.stageInfo.left,
y: ev.targetTouches[0].clientY - this.stageInfo.top
}
this.moveY = obj.y
this.moveX = obj.x
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.startY = obj.y
this.startX = obj.x
this.points.push(obj)
}
},
touchEnd(ev) {
ev = ev || event
ev.preventDefault()
if (ev.touches.length == 1) {
let obj = {
x: ev.targetTouches[0].clientX - this.stageInfo.left,
y: ev.targetTouches[0].clientY - this.stageInfo.top
}
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.points.push(obj)
}
},
},
}
</script>
<style>
.Sign .signatureBox {
width: 100%;
height: calc(100% - 50px);
box-sizing: border-box;
overflow: hidden;
background: #fff;
z-index: 100;
display: flex;
flex-direction: column;
}
.Sign .canvasBox {
box-sizing: border-box;
flex: 1;
}
.Sign canvas {
border: 1px solid #7d7d7d;
}
.Sign .btnBox {
padding: 10px;
text-align: center;
}
.Sign .btnBox button:first-of-type {
background: transparent;
border-radius: 4px;
height: 40px;
width: 80px;
font-size: 14px;
}
.Sign .btnBox button:last-of-type {
background: #71b900;
color: #fff;
border-radius: 4px;
height: 40px;
width: 80px;
font-size: 14px;
}
</style>
src/components/approval/approvalDetails.vue
View file @ 38272837
This diff is collapsed.
src/components/approval/approvalMan.vue
View file @ 38272837
...@@ -100,26 +100,26 @@ ...@@ -100,26 +100,26 @@
{{item.AuditStatusName}} {{item.AuditStatusName}}
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.SourceName}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.SourceName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">
<span v-if="item.TempleteId>0" style="text-decoration: underline;" @click="See(item,'approvalDetails','approvalMan','chakan')">{{item.OrderCode}}</span>
<span v-else>{{item.OrderCode}}</span>
</td>
<td :rowspan="item.DetailList.length" v-if="index==0"> <td :rowspan="item.DetailList.length" v-if="index==0">
<p>{{item.EmName}}</p> <p>{{item.EmName}}</p>
<p>{{item.Time}}</p> <p>{{item.Time}}</p>
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0"></td>
<td>{{delist.CategoryName}}</td> <td>{{delist.CategoryName}}</td>
<td>{{delist.PropertyName}}</td> <td>{{delist.PropertyName}}</td>
<td>{{delist.PropertyNum}}</td> <td>{{delist.PropertyNum}}</td>
<td>{{delist.BrandName}}</td> <td>{{delist.BrandName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.UpdateBy}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.UpdateBy}}</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.TempleteId>0" @click="See(item,'approvalDetails','approvalMan','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
<img @click="See(item,'approvalDetails','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.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-show="showTable==1" @click="See(item,'approvalDetails','shenpi')" style="width:24px;height:24px" src="../../assets/img/shenpi.png" alt=""> <img v-show="showTable==1" @click="See(item,'approvalDetails','approvalMan','shenpi')" style="width:24px;height:24px" src="../../assets/img/shenpi.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-show="showTable==1" @click="ZhuanJiao(item)" style="width:24px;height:24px" src="../../assets/img/huifu.png" alt=""> <img v-show="showTable==1" @click="ZhuanJiao(item)" style="width:24px;height:24px" src="../../assets/img/huifu.png" alt="">
...@@ -249,6 +249,10 @@ export default { ...@@ -249,6 +249,10 @@ export default {
} }
}, },
created(){
this.showTable=this.$route.query.showTable?this.$route.query.showTable:1;
},
mounted(){ mounted(){
this.getList(); this.getList();
this.getNode(); this.getNode();
...@@ -283,16 +287,17 @@ export default { ...@@ -283,16 +287,17 @@ export default {
}, },
ZhuanJiao(item){ ZhuanJiao(item){
this.dialogState=true; this.dialogState=true;
console.log("item",item);
this.addMsg.WorkFlowId=item.Id; this.addMsg.WorkFlowId=item.Id;
}, },
See(item,path,type){ See(item,path,backto,type){
let shenpistr=type; let shenpistr=type;
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
Id:item.Id, Id:item.Id,
backto:backto,
showTable:this.showTable,
compType:shenpistr, compType:shenpistr,
} }
}); });
...@@ -335,7 +340,6 @@ export default { ...@@ -335,7 +340,6 @@ export default {
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.StateEnumList=res.data.data; this.StateEnumList=res.data.data;
console.log("this.StateEnumList",this.StateEnumList)
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -369,7 +373,6 @@ export default { ...@@ -369,7 +373,6 @@ export default {
this.apiJavaPost("/api/property/GetPropertyWaitMyAuditPageList",this.msg, this.apiJavaPost("/api/property/GetPropertyWaitMyAuditPageList",this.msg,
res => { res => {
this.loading=false; this.loading=false;
// console.log("res",res);
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.tableData=res.data.data.pageData; this.tableData=res.data.data.pageData;
this.total=res.data.data.count; this.total=res.data.data.count;
...@@ -386,7 +389,6 @@ export default { ...@@ -386,7 +389,6 @@ export default {
this.apiJavaPost("/api/property/GetPropertyMyAuditedPageList",this.msg, this.apiJavaPost("/api/property/GetPropertyMyAuditedPageList",this.msg,
res => { res => {
this.loading=false; this.loading=false;
// console.log("res",res);
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.tableData=res.data.data.pageData; this.tableData=res.data.data.pageData;
this.total=res.data.data.count; this.total=res.data.data.count;
...@@ -403,7 +405,6 @@ export default { ...@@ -403,7 +405,6 @@ export default {
this.apiJavaPost("/api/property/GetPropertyMyStartedPageList",this.msg, this.apiJavaPost("/api/property/GetPropertyMyStartedPageList",this.msg,
res => { res => {
this.loading=false; this.loading=false;
// console.log("res",res);
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.tableData=res.data.data.pageData; this.tableData=res.data.data.pageData;
this.total=res.data.data.count; this.total=res.data.data.count;
...@@ -432,7 +433,6 @@ export default { ...@@ -432,7 +433,6 @@ export default {
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.SourceList=res.data.data; this.SourceList=res.data.data;
console.log("this.SourceList",this.SourceList)
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -452,6 +452,7 @@ export default { ...@@ -452,6 +452,7 @@ export default {
padding:20px 30px; padding:20px 30px;
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB; background: #F8FAFB;
} }
</style> </style>
src/components/assetsman/PaiTui.vue
View file @ 38272837
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
<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','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>
</td> </td>
...@@ -219,12 +219,18 @@ ...@@ -219,12 +219,18 @@
<td>{{delist.CancelStockEmployeeName}}</td> <td>{{delist.CancelStockEmployeeName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</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">
<img v-if="item.AuditStatus==3 && item.CreateBy==EmployeeId" @click="Edit1(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</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==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">
<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>
</td> </td>
</tr> </tr>
...@@ -334,6 +340,7 @@ ...@@ -334,6 +340,7 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="退库单" title="退库单"
:visible.sync="dialogState1" :visible.sync="dialogState1"
...@@ -633,6 +640,7 @@ export default { ...@@ -633,6 +640,7 @@ export default {
// this.tableHeight=document.body.clientHeight-40-66-87; // this.tableHeight=document.body.clientHeight-40-66-87;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.EmployeeId=userInfo.EmployeeId; this.EmployeeId=userInfo.EmployeeId;
this.showTable=this.$route.query.showTable?this.$route.query.showTable:1;
}, },
mounted(){ mounted(){
this.getList(); this.getList();
...@@ -641,10 +649,28 @@ export default { ...@@ -641,10 +649,28 @@ export default {
}, },
methods:{ methods:{
// 退库单编辑
Edit1(item){
this.addMsg1.Id=item.Id;
this.addMsg1.BackTime=item.Time;
this.addMsg1.Remark=item.Remark;
this.addMsg1.DetailList=[];
this.wlItemList=[];
item.DetailList.forEach(item=>{
item.Name=item.PropertyName;
item.PropertyStatusName="修改";
this.wlItemList.push(item);
})
this.dialogState1=true;
this.ItemCheckList=[];
},
// 编辑 // 编辑
Edit(item){ Edit(item){
console.log("item",item)
this.addMsg.EmployeeId=item.EmployeeId; this.addMsg.EmployeeId=item.EmployeeId;
this.addMsg.Id=item.Id;
this.addMsg.Time=item.Time; this.addMsg.Time=item.Time;
this.addMsg.Remark=item.Remark; this.addMsg.Remark=item.Remark;
...@@ -652,19 +678,22 @@ export default { ...@@ -652,19 +678,22 @@ export default {
this.wlItemList=[]; this.wlItemList=[];
item.DetailList.forEach(item=>{ item.DetailList.forEach(item=>{
item.Name=item.PropertyName; item.Name=item.PropertyName;
item.PropertyStatusName="修改";
this.wlItemList.push(item); this.wlItemList.push(item);
}) })
this.EmName=item.EmName; this.EmName=item.EmName;
this.getEmployee(2); this.getEmployee(2);
this.dialogState=true; this.dialogState=true;
this.ItemCheckList=[];
}, },
See(item,path,type){ See(item,path,backto,type){
let shenpistr=type; let shenpistr=type;
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
Id:item.Id, Id:item.Id,
backto:backto,
showTable:this.showTable,
compType:shenpistr, compType:shenpistr,
} }
}); });
...@@ -775,12 +804,13 @@ export default { ...@@ -775,12 +804,13 @@ export default {
if(this.ItemCheckList.length==0){ if(this.ItemCheckList.length==0){
return; return;
} }
this.$confirm("确认移出资产？","提示", { this.$confirm("确认移出资产？","提示", {
confirmButtonText:"确定", confirmButtonText:"确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
var set=this.ItemCheckList.map(item=>item.Id) var set=this.ItemCheckList.map(item=>item.PropertyId)
var resArr=this.wlItemList.filter(item=>!set.includes(item.PropertyId)) var resArr=this.wlItemList.filter(item=>!set.includes(item.PropertyId))
this.wlItemList=resArr; this.wlItemList=resArr;
this.addMsg.Money=0; this.addMsg.Money=0;
...@@ -797,6 +827,7 @@ export default { ...@@ -797,6 +827,7 @@ export default {
this.wlcheckList=[]; this.wlcheckList=[];
this.wlisCkedAll=false; this.wlisCkedAll=false;
}, },
// 选择资产
chooseWu(){ chooseWu(){
this.wlcheckList.forEach(item=>{ this.wlcheckList.forEach(item=>{
this.wlItemList.push(item); this.wlItemList.push(item);
......
src/components/assetsman/assetsList.vue
View file @ 38272837
...@@ -99,9 +99,8 @@ ...@@ -99,9 +99,8 @@
<td>{{item.PropertyModel}}</td> <td>{{item.PropertyModel}}</td>
<td> <td>
<p v-if="item.EmName!=''">使用人名称：{{item.EmName}}</p> <p>{{item.EmName}}</p>
<p v-if="item.GetTime!=''" style="padding:2px 0">使用时间：{{item.GetTime}}</p> <p style="padding:2px 0">{{item.GetTime}}</p>
<!-- <p>归还时间：{{item.BackTime}}</p> -->
</td> </td>
<td> <td>
...@@ -295,18 +294,25 @@ ...@@ -295,18 +294,25 @@
:visible.sync="caozuoState" :visible.sync="caozuoState"
top="3%" top="3%"
width="850px"> width="850px">
<div class="f12">
<span>资产名称：{{OperationInfo.Name}}</span>
<span style="margin:0 20px">资产编码：{{OperationInfo.PropertyNum}}</span>
</div>
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> <table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th>类型</th> <th>类型</th>
<th>内容</th> <th>内容</th>
<th>操作人</th> <th>操作人/时间</th>
<th>操作时间</th> <th>操作时间</th>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(item,index) in OperationList" :key="index"> <tr v-for="(item,index) in OperationList" :key="index">
<td>{{item.TypeName}}</td> <td>{{item.TypeName}}</td>
<td>{{item.Content}}</td> <td>{{item.Content}}</td>
<td>{{item.CreateBy}}</td> <td>
<p>{{item.CreateBy}}</p>
<p>{{item.CreateDate}}</p>
</td>
<td>{{item.CreateDate}}</td> <td>{{item.CreateDate}}</td>
</tr> </tr>
<tr v-show="OperationList.length==0"> <tr v-show="OperationList.length==0">
...@@ -432,6 +438,7 @@ export default { ...@@ -432,6 +438,7 @@ export default {
PropertyId:'', PropertyId:'',
}, },
OperationList:[], OperationList:[],
OperationInfo:{},
OperationLoad:false, OperationLoad:false,
EmployeeList1:[], EmployeeList1:[],
EmployeeList2:[], EmployeeList2:[],
...@@ -449,6 +456,7 @@ export default { ...@@ -449,6 +456,7 @@ export default {
}, },
methods:{ methods:{
Operation(item){ Operation(item){
this.OperationInfo=item;
this.caozuoState=true; this.caozuoState=true;
this.msg1.PropertyId=item.Id; this.msg1.PropertyId=item.Id;
this.getOperation(); this.getOperation();
...@@ -649,7 +657,6 @@ export default { ...@@ -649,7 +657,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)
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/global/index.vue
View file @ 38272837
...@@ -102,13 +102,13 @@ export default { ...@@ -102,13 +102,13 @@ export default {
top:0; top:0;
left: 0; left: 0;
height: 100%; height: 100%;
z-index: 100; z-index: 1;
} }
.appContent .HeadDiv{ .appContent .HeadDiv{
position: fixed; position: fixed;
width: calc(100% - 214px); width: calc(100% - 214px);
top: 0; top: 0;
z-index: 200; z-index: 1;
background: #fff; background: #fff;
padding:20px 0; padding:20px 0;
} }
......
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