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