Skip to content

A
assets
Commit 9a97c946 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent c8b52fa4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2028 additions and 2097 deletions
src/components/Materialman/chukudan.vue
View file @ 9a97c946
This diff is collapsed.
src/components/approval/groupEmpowerMan.vue
View file @ 9a97c946
This diff is collapsed.
src/components/assetsman/BulkImport.vue
View file @ 9a97c946
This diff is collapsed.
src/components/assetsman/outboundApplication.vue
View file @ 9a97c946
...@@ -27,93 +27,86 @@ ...@@ -27,93 +27,86 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-input <el-input class="w200" size="small" v-model="msg.GoodsName" placeholder="商品名称"
class="w200" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
size="small"
v-model="msg.GoodsName"
placeholder="商品名称"
@keyup.enter.native="msg.pageIndex=1,getList()"
></el-input>
</li> </li>
<li> <li>
<el-input <el-input class="w200" size="small" v-model="msg.OrderNo" placeholder="订单号"
class="w200" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
size="small"
v-model="msg.OrderNo"
placeholder="订单号"
@keyup.enter.native="msg.pageIndex=1,getList()"
></el-input>
</li> </li>
</ul> </ul>
<div class="overflowY"> <div class="overflowY">
<table style="margin-top:10px" class="myTable noHoverTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> <table style="margin-top:10px" class="myTable noHoverTable" v-loading="loading" border="0" cellspacing="0"
cellpadding="0">
<thead> <thead>
<th width="75">申请状态</th> <th width="75">申请状态</th>
<th width="75">小程序名称</th> <th width="75">小程序名称</th>
<th width="75">商户名称</th> <th width="75">商户名称</th>
<th width="75">订单号</th> <th width="75">订单号</th>
<th >出库名称</th> <th>出库名称</th>
<th >出库规格</th> <th>出库规格</th>
<th width="75">出库数量</th> <th width="75">出库数量</th>
<th width="75">出库状态</th> <th width="75">出库状态</th>
<th width="120">申请时间</th> <th width="120">申请时间</th>
<th width="120">操作</th> <th width="120">操作</th>
</thead> </thead>
<tbody> <tbody>
<template v-for="(item,index1) in tableData"> <template v-for="(item,index1) in tableData">
<tr :class="index==0?'trNobottom':''" v-for="(delist,index) in item.WarehouseOutGoodsList" ::key="index + '-only'"> <tr :class="index==0?'trNobottom':''" v-for="(delist,index) in item.WarehouseOutGoodsList"
<td :class="index1==tableData.length-1?'lastTdLeft':''" :rowspan="item.WarehouseOutGoodsList.length" v-if="index==0"> ::key="index + '-only'">
<span class="ColorSpan greenSpan" v-if="item.ApplyStatus==1">待</span> <td :class="index1==tableData.length-1?'lastTdLeft':''" :rowspan="item.WarehouseOutGoodsList.length"
<span class="ColorSpan redSpan" v-if="item.ApplyStatus==2">已</span> v-if="index==0">
<span class="ColorSpan purpleSpan" v-if="item.ApplyStatus==3">拒</span> <span class="ColorSpan greenSpan" v-if="item.ApplyStatus==1">待</span>
</td> <span class="ColorSpan redSpan" v-if="item.ApplyStatus==2">已</span>
<td :rowspan="item.WarehouseOutGoodsList.length" v-if="index==0">{{item.MallBaseName}}</td> <span class="ColorSpan purpleSpan" v-if="item.ApplyStatus==3">拒</span>
<td :rowspan="item.WarehouseOutGoodsList.length" v-if="index==0">{{item.TenantName}}</td> </td>
<td :rowspan="item.WarehouseOutGoodsList.length" v-if="index==0">{{item.MallBaseName}}</td>
<td >{{delist.OrderNo}}</td> <td :rowspan="item.WarehouseOutGoodsList.length" v-if="index==0">{{item.TenantName}}</td>
<td >{{delist.NewGoodsName}}</td> <td>{{delist.OrderNo}}</td>
<td >{{delist.NewSpecification}}</td>
<td >{{delist.NewNumber}}</td> <td>{{delist.NewGoodsName}}</td>
<td>{{delist.NewSpecification}}</td>
<td>{{delist.NewNumber}}</td>
<td :rowspan="item.WarehouseOutGoodsList.length" v-if="index==0">
<span v-if="item.OutStatus==0">未出库</span>
<span v-if="item.OutStatus==1">部分出库</span> <td :rowspan="item.WarehouseOutGoodsList.length" v-if="index==0">
<span v-if="item.OutStatus==2">全部出库</span> <span v-if="item.OutStatus==0">未出库</span>
</td> <span v-if="item.OutStatus==1">部分出库</span>
<td :rowspan="item.WarehouseOutGoodsList.length" v-if="index==0">{{item.CreateDateStr}}</td> <span v-if="item.OutStatus==2">全部出库</span>
</td>
<td :class="index1==tableData.length-1?'lastTdRight':''" :rowspan="item.WarehouseOutGoodsList.length" v-if="index==0"> <td :rowspan="item.WarehouseOutGoodsList.length" v-if="index==0">{{item.CreateDateStr}}</td>
<el-tooltip class="item" effect="dark" content="查看详情" placement="top" > <td :class="index1==tableData.length-1?'lastTdRight':''" :rowspan="item.WarehouseOutGoodsList.length"
<img @click="SeeDetails(item,'/outboundDetails')" style="width:24px;height:24px;margin-right:10px;" src="../../assets/img/chakan.png" alt="" /> v-if="index==0">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="出库" placement="top" v-if="item.ApplyStatus==2&&(item.OutStatus==0||item.OutStatus==1)" > <el-tooltip class="item" effect="dark" content="查看详情" placement="top">
<img @click="goUrl('outboundOperate',item.ID)" style="width:24px;height:24px;margin-right:10px;" src="../../assets/img/chuk.png" alt="" v-if="item.ApplyStatus==2&&(item.OutStatus==0||item.OutStatus==1)" /> <img @click="SeeDetails(item,'/outboundDetails')" style="width:24px;height:24px;margin-right:10px;"
</el-tooltip> src="../../assets/img/chakan.png" alt="" />
</td> </el-tooltip>
<el-tooltip class="item" effect="dark" content="出库" placement="top"
v-if="item.ApplyStatus==2&&(item.OutStatus==0||item.OutStatus==1)">
<img @click="goUrl('outboundOperate',item.ID)" style="width:24px;height:24px;margin-right:10px;"
src="../../assets/img/chuk.png" alt=""
v-if="item.ApplyStatus==2&&(item.OutStatus==0||item.OutStatus==1)" />
</el-tooltip>
</td>
</tr>
</template>
<tr v-show="tableData.length==0">
<td colspan="14" align="center">暂无数据</td>
</tr> </tr>
</template>
<tr v-show="tableData.length==0">
<td colspan="14" align="center">暂无数据</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<el-pagination class="myPageBottom" <el-pagination class="myPageBottom" @current-change="currentChange" background :page-size="msg.pageSize"
@current-change="currentChange" :current-page.sync="msg.pageIndex" layout="prev, pager, next" :total="total">
background
:page-size="msg.pageSize"
:current-page.sync="msg.pageIndex"
layout="prev, pager, next"
:total="total">
</el-pagination> </el-pagination>
...@@ -174,11 +167,11 @@ ...@@ -174,11 +167,11 @@
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
SupplierId:0, SupplierId: 0,
ApplyStatus: 0, ApplyStatus: 0,
OutStatus: -1, OutStatus: -1,
GoodsName:'', GoodsName: '',
OrderNo:'', OrderNo: '',
}, },
Updatemsg: { Updatemsg: {
ID: 0, ID: 0,
...@@ -192,19 +185,16 @@ ...@@ -192,19 +185,16 @@
}, },
mounted() { mounted() {
this.getList(); this.getList();
}, },
methods: { methods: {
SeeDetails(item,path){ SeeDetails(item, path) {
this.$router.push({ this.$router.push({
path: path, path: path,
query: { query: {
ID:item.ID ID: item.ID
}
}
}); });
},
},
getList() { getList() {
this.loading = true; this.loading = true;
this.apiJavaPost( this.apiJavaPost(
...@@ -213,7 +203,6 @@ ...@@ -213,7 +203,6 @@
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
console.log(res,'resss');
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 {
...@@ -222,7 +211,6 @@ ...@@ -222,7 +211,6 @@
}, },
null null
); );
}, },
currentChange(val) { currentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
...@@ -257,11 +245,11 @@ ...@@ -257,11 +245,11 @@
}, },
//跳转 //跳转
goUrl(path,ID) { goUrl(path, ID) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
ID:ID ID: ID
} }
}); });
} }
...@@ -310,18 +298,21 @@ ...@@ -310,18 +298,21 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.outBand_div{
width:24px; .outBand_div {
height:24px; width: 24px;
height: 24px;
border-radius: 6px; border-radius: 6px;
text-align: center; text-align: center;
line-height: 24px; line-height: 24px;
background-color: #D7D6FF; background-color: #D7D6FF;
color:#7B78FF; color: #7B78FF;
display:inline-block; display: inline-block;
} }
.outboundApplication .vxe-cell{
.outboundApplication .vxe-cell {
display: flex; display: flex;
margin:5px 0; margin: 5px 0;
} }
</style> </style>
src/components/assetsman/outboundOperate.vue
View file @ 9a97c946
...@@ -15,19 +15,19 @@ ...@@ -15,19 +15,19 @@
.outbound_Main .outbound_Gun { .outbound_Main .outbound_Gun {
width: 100%; width: 100%;
} }
</style> </style>
<template> <template>
<div class="outbound_Main"> <div class="outbound_Main">
<div class="routerTitle" style="padding:17px 30px;"> <div class="routerTitle" style="padding:17px 30px;">
<span class="pageTitle" style="margin-top:-5px;">商品出库</span> <span class="pageTitle" style="margin-top:-5px;">商品出库</span>
<span @click="sureOutband()" class="chaxunSpan" v-if="ISoperation == false" >确认出库</span> <span @click="sureOutband()" class="chaxunSpan" v-if="ISoperation == false">确认出库</span>
<span class="chaxunSpan" style=" background:#909399;" v-if="ISoperation == true" >确认出库</span> <span class="chaxunSpan" style=" background:#909399;" v-if="ISoperation == true">确认出库</span>
</div> </div>
<ul class="queryul" style="margin-left:20px;"> <ul class="queryul" style="margin-left:20px;">
扫码出库 扫码出库
<li style="min-width: 364px;"> <li style="min-width: 364px;">
<el-input ref="barCodeInput" v-model="barCode" placeholder="商品出库条码" <el-input ref="barCodeInput" v-model="barCode" placeholder="商品出库条码" @keyup.enter.native="payCode"></el-input>
@keyup.enter.native="payCode"></el-input>
</li> </li>
</ul> </ul>
<div class="outBound_Cont"> <div class="outBound_Cont">
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
<vxe-table-column title="操作"> <vxe-table-column title="操作">
<template v-slot="{ row, rowIndex }"> <template v-slot="{ row, rowIndex }">
<img @click="delBound(row,rowIndex)" style="width:24px;height:24px" <img @click="delBound(row,rowIndex)" style="width:24px;height:24px" src="../../assets/img/delete.png"
src="../../assets/img/delete.png" alt=""> alt="">
</template> </template>
</vxe-table-column> </vxe-table-column>
</vxe-table> </vxe-table>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<vxe-table-column field="NewSpecification" title="出库规格"></vxe-table-column> <vxe-table-column field="NewSpecification" title="出库规格"></vxe-table-column>
<vxe-table-column field="NewNumber" title="出库数量"></vxe-table-column> <vxe-table-column field="NewNumber" title="出库数量"></vxe-table-column>
<vxe-table-column field="nowBound" title="正在出库"></vxe-table-column> <vxe-table-column field="nowBound" title="正在出库"></vxe-table-column>
<template v-slot:empty> <template v-slot:empty>
<span> <span>
<p>仓库中暂无商品</p> <p>仓库中暂无商品</p>
...@@ -120,9 +120,9 @@ ...@@ -120,9 +120,9 @@
WarehouseId: 0, WarehouseId: 0,
WarehouseOutGoodsDetailList: [] WarehouseOutGoodsDetailList: []
}, },
orderNum:0, orderNum: 0,
ISoperation:false, ISoperation: false,
WarehouseList:[] WarehouseList: []
}; };
}, },
mounted() { mounted() {
...@@ -142,10 +142,10 @@ ...@@ -142,10 +142,10 @@
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
getWarehouseL(){ getWarehouseL() {
this.ISoperation = false this.ISoperation = false
this.WarehouseList.forEach(x=>{ this.WarehouseList.forEach(x => {
if(x.WarehouseId == this.msg.WarehouseId){ if (x.WarehouseId == this.msg.WarehouseId) {
this.ISoperation = true this.ISoperation = true
} }
}) })
...@@ -158,7 +158,6 @@ ...@@ -158,7 +158,6 @@
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getWareHouseList = res.data.data; this.getWareHouseList = res.data.data;
console.log(res,'res');
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -167,11 +166,11 @@ ...@@ -167,11 +166,11 @@
); );
}, },
//获取盘点仓库的列表 //获取盘点仓库的列表
getSuppliesCheckList(){ getSuppliesCheckList() {
this.apiJavaPost("/api/WarehouseOut/GetSuppliesCheckList", {}, this.apiJavaPost("/api/WarehouseOut/GetSuppliesCheckList", {},
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.WarehouseList = res.data.data && res.data.data.length>0 ? res.data.data:[] this.WarehouseList = res.data.data && res.data.data.length > 0 ? res.data.data : []
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -211,31 +210,31 @@ ...@@ -211,31 +210,31 @@
this.loadingSearch = false; this.loadingSearch = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
var myData = res.data.data.GoodsModel; var myData = res.data.data.GoodsModel;
if(myData){ if (myData) {
var scanMsg = {}; var scanMsg = {};
var data2 = JSON.parse(JSON.stringify(this.tableData)); var data2 = JSON.parse(JSON.stringify(this.tableData));
// 2021-4-1加的 // 2021-4-1加的
let goon = true let goon = true
if(myData.ValidityId>0 && this.scanData.length>0){ if (myData.ValidityId > 0 && this.scanData.length > 0) {
this.scanData.map(x=>{ this.scanData.map(x => {
if(x.ValidityId == myData.ValidityId){ if (x.ValidityId == myData.ValidityId) {
this.Error("该商品重复扫码"); this.Error("该商品重复扫码");
goon = false goon = false
return return
} }
}) })
} }
if(goon == false){//如果有相同的id 就不执行下面的内容 if (goon == false) { //如果有相同的id 就不执行下面的内容
return return
} }
this.orderNum=0; this.orderNum = 0;
let isUpdate=false let isUpdate = false
for (let i = 0; i < data2.length; i++) { for (let i = 0; i < data2.length; i++) {
let x = data2[i]; let x = data2[i];
if ((myData.GoodsId == x.NewGoodsId) && (myData.SpecificationKey == x.NewSpecificationSort)) { if ((myData.GoodsId == x.NewGoodsId) && (myData.SpecificationKey == x.NewSpecificationSort)) {
this.orderNum++; this.orderNum++;
if(x.nowBound<x.NewNumber){ if (x.nowBound < x.NewNumber) {
isUpdate=true; isUpdate = true;
x.nowBound++; x.nowBound++;
this.tableData = data2; this.tableData = data2;
this.scanData.unshift(myData); this.scanData.unshift(myData);
...@@ -254,11 +253,11 @@ ...@@ -254,11 +253,11 @@
} }
} }
} }
if(this.orderNum>0 && !isUpdate){ if (this.orderNum > 0 && !isUpdate) {
this.Error("超过了出库数量"); this.Error("超过了出库数量");
} }
this.getorderNum(); this.getorderNum();
}else{ } else {
this.Error(res.data.data.Msg); this.Error(res.data.data.Msg);
} }
} else { } else {
...@@ -269,8 +268,8 @@ ...@@ -269,8 +268,8 @@
null null
); );
}, },
getorderNum(){ getorderNum() {
if(this.orderNum==0){ if (this.orderNum == 0) {
this.Error('该商品未在出库列表中'); this.Error('该商品未在出库列表中');
} }
}, },
......
src/components/global/wlDetails.vue
View file @ 9a97c946
This diff is collapsed.
src/components/report/AssetsRecord.vue
View file @ 9a97c946
This diff is collapsed.
src/components/report/codePrint.vue
View file @ 9a97c946
<template> <template>
<div class="codePrint"> <div class="codePrint">
<div class="codeContent"> <div class="codeContent">
<ul class="codeUl"> <ul class="codeUl">
<li v-for="(item,index) in tableData" :key="index"> <li v-for="(item,index) in tableData" :key="index">
<div> <div>
<img v-if="item.QRCode && item.QRCode!=''" :src="`${baseUrl}${item.QRCode}`" alt=""> <img v-if="item.QRCode && item.QRCode!=''" :src="`${baseUrl}${item.QRCode}`" alt="">
<img v-else style="width:99px;heigth:99px" src="../../assets/img/noimg.png" alt=""> <img v-else style="width:99px;heigth:99px" src="../../assets/img/noimg.png" alt="">
</div> </div>
<p style="position:relative;top:-10px"><span @click="getCheckDes(item)" class="underline">{{ item.PropertyNum }}</span></p> <p style="position:relative;top:-10px"><span @click="getCheckDes(item)"
class="underline">{{ item.PropertyNum }}</span></p>
</li>
</ul> </li>
<div v-show="tableData.length==0" style="text-align:center;padding:100px 0" class="f18"> </ul>
暂无数据 <div v-show="tableData.length==0" style="text-align:center;padding:100px 0" class="f18">
</div> 暂无数据
</div>
</div> </div>
<el-dialog top="0" title="资产详情" :visible.sync="CheckDetailState" width="1150px"> <el-dialog top="0" title="资产详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
...@@ -22,104 +23,108 @@ ...@@ -22,104 +23,108 @@
</template> </template>
<script> <script>
import CheckDetails from "@/components/global/CheckDetails.vue"; import CheckDetails from "@/components/global/CheckDetails.vue";
export default { export default {
name: "assetsList", name: "assetsList",
components: { components: {
CheckDetails CheckDetails
},
data() {
return {
baseUrl:'http://property.oytour.com',
CheckDetailState: false,
currentPage: 1,
tableData: [],
loading: false,
total: 0,
msg: {
Name: "",
PropertyNum: "",
SerialNumber: "",
CategoryId: "",
PropertyStatus: "",
EmployeeId: "",
SupplierId: "",
StartTime: "",
EndTime: ""
},
PropertyId:'',
};
},
mounted() {
if(this.$route.query.msg){
this.msg=JSON.parse(this.$route.query.msg);
}
this.getList();
},
methods: {
getCheckDes(item){
this.PropertyId=item.Id;
this.CheckDetailState=true;
setTimeout(()=>{
this.$refs.mychild.InitData(this.PropertyId);
},10)
}, },
getList() { data() {
delete this.msg.pageIndex; return {
delete this.msg.pageSize; baseUrl: 'http://property.oytour.com',
this.loading = true; CheckDetailState: false,
this.apiJavaPost(
"/api/property/GetPropertyQRCodeList", currentPage: 1,
this.msg, tableData: [],
res => { loading: false,
this.loading = false; total: 0,
console.log("res",res); msg: {
if (res.data.resultCode === 1) { Name: "",
this.tableData = res.data.data; PropertyNum: "",
} else { SerialNumber: "",
this.Error(res.data.message); CategoryId: "",
} PropertyStatus: "",
EmployeeId: "",
SupplierId: "",
StartTime: "",
EndTime: ""
}, },
null PropertyId: '',
); };
}, },
mounted() {
if (this.$route.query.msg) {
this.msg = JSON.parse(this.$route.query.msg);
}
this.getList();
},
methods: {
getCheckDes(item) {
this.PropertyId = item.Id;
this.CheckDetailState = true;
setTimeout(() => {
this.$refs.mychild.InitData(this.PropertyId);
}, 10)
},
getList() {
delete this.msg.pageIndex;
delete this.msg.pageSize;
this.loading = true;
this.apiJavaPost(
"/api/property/GetPropertyQRCodeList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.tableData = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
}
};
}
};
</script> </script>
<style> <style>
.codePrint{ .codePrint {
margin: 0; margin: 0;
padding: 0; padding: 0;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
margin-top:10px; margin-top: 10px;
box-sizing: border-box; box-sizing: border-box;
page-break-after: always; page-break-after: always;
position: absolute; position: absolute;
} }
.codeUl{
.codeUl {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
page-break-after: always; page-break-after: always;
} }
.codeUl li{
.codeUl li {
display: inline-block; display: inline-block;
width: 200px; width: 200px;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
} }
.codeContent{
.codeContent {
width: 1000px; width: 1000px;
margin: 0 auto; margin: 0 auto;
border: 1px solid #333333; border: 1px solid #333333;
padding:0!important; padding: 0 !important;
} }
</style> </style>
src/main.js
View file @ 9a97c946
...@@ -38,7 +38,6 @@ Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils ...@@ -38,7 +38,6 @@ Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
Vue.filter("YMD", function (date) { Vue.filter("YMD", function (date) {
return moment(date).format("YYYY-MM-DD"); return moment(date).format("YYYY-MM-DD");
}) })
Vue.filter("MD", function (date) { Vue.filter("MD", function (date) {
......
src/router/config.js
View file @ 9a97c946
...@@ -6,7 +6,6 @@ import index from '../components/global/index' ...@@ -6,7 +6,6 @@ import index from '../components/global/index'
export default { export default {
routes: [ routes: [
{ {
path: '/login', path: '/login',
name: 'Login', name: 'Login',
......
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