Skip to content

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

页面修改

parent c8b52fa4
Expand all Show 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
......@@ -4,8 +4,10 @@
<span class="pageTitle">授权管理</span>
<div class="groupempowerman">
<span class="ChangeTable">
<span @click="msg.type=2,msg.pageIndex=1,msg.Status=0,getList()" :class="msg.type==2?'spanActive':''">集团</span>
<span @click="msg.type=1,msg.pageIndex=1,msg.Status=0,getList()" :class="msg.type==1?'spanActive':''">个人用户</span>
<span @click="msg.type=2,msg.pageIndex=1,msg.Status=0,getList()"
:class="msg.type==2?'spanActive':''">集团</span>
<span @click="msg.type=1,msg.pageIndex=1,msg.Status=0,getList()"
:class="msg.type==1?'spanActive':''">个人用户</span>
</span>
<span class="ChangeTable" style="margin-Top:10px">
<span @click="msg.Status=0,msg.pageIndex=1,getList()" :class="msg.Status==0?'spanActive':''">全部</span>
......@@ -24,8 +26,7 @@
</div>
<div class="padContent groupempowerman_list">
<vxe-table stripe style="margin-top:15px" :loading="loading"
:data="tableData">
<vxe-table stripe style="margin-top:15px" :loading="loading" :data="tableData">
<vxe-table-column title="状态">
<template v-slot="{ row }">
<span v-if="row.Status==1">待审核</span>
......@@ -33,7 +34,7 @@
<span v-if="row.Status==3">已拒绝</span>
</template>
</vxe-table-column>
<vxe-table-column field="DomainName" title="集团域名" ></vxe-table-column>
<vxe-table-column field="DomainName" title="集团域名"></vxe-table-column>
<vxe-table-column field="Account" title="账户" v-if='msg.type==1'></vxe-table-column>
<vxe-table-column field="MallBaseName" title="小程序名字" v-if='msg.type==1'></vxe-table-column>
<vxe-table-column field="TenantName" title="商户名称" v-if='msg.type==1'></vxe-table-column>
......@@ -53,72 +54,64 @@
</vxe-table-column>
</vxe-table>
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:current-page.sync="msg.pageIndex"
:total="total">
<el-pagination @current-change="currentChange" background :page-size="msg.pageSize" layout="prev, pager, next"
:current-page.sync="msg.pageIndex" :total="total">
</el-pagination>
</div>
</div>
</template>
<script>
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: 'groupEmpowerMan',
components: {
},
data(){
return{
data() {
return {
showTable:0,
showTable: 0,
tableData: [],
loading:false,
total:0,
msg:{
pageIndex:1,
pageSize:15,
type:2,
Status:0
loading: false,
total: 0,
msg: {
pageIndex: 1,
pageSize: 15,
type: 2,
Status: 0
},
rules:{
AuditEmId: [
{ required: true, message: '请选择转交人', trigger: 'change' }
]
rules: {
AuditEmId: [{
required: true,
message: '请选择转交人',
trigger: 'change'
}]
},
}
},
created(){
created() {
},
mounted(){
console.log(2)
mounted() {
this.getList();
},
methods:{
goUrl(path){
methods: {
goUrl(path) {
this.$router.push({
path: "/" + path,
query: {
}
query: {}
});
},
getList(){
this.loading=true;
this.apiJavaPost("/api/Authorize/GetMaterialPageList",this.msg,
getList() {
this.loading = true;
this.apiJavaPost("/api/Authorize/GetMaterialPageList", this.msg,
res => {
this.loading=false;
this.loading = false;
if (res.data.resultCode === 1) {
this.tableData=res.data.data.pageData;
this.total=res.data.data.count;
this.tableData = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
}
......@@ -130,16 +123,19 @@ export default {
this.msg.pageIndex = val;
this.getList();
},
agree(row){
this.$confirm("同意审核!","提示", {
confirmButtonText:"确定",
agree(row) {
this.$confirm("同意审核!", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: 'warning'
}).then(() => {
this.apiJavaPost("/api/Authorize/UpdateAuthorize",{ID:row.ID,Status:2},
this.apiJavaPost("/api/Authorize/UpdateAuthorize", {
ID: row.ID,
Status: 2
},
res => {
if (res.data.resultCode === 1) {
this.msg.Status =2
this.msg.Status = 2
this.getList();
this.Success(res.data.message)
} else {
......@@ -153,16 +149,19 @@ export default {
this.$message.info('已取消审核！')
});
},
refuse(row){
this.$confirm("是否拒绝？","提示", {
confirmButtonText:"确定",
refuse(row) {
this.$confirm("是否拒绝？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: 'warning'
}).then(() => {
this.apiJavaPost("/api/Authorize/UpdateAuthorize",{ID:row.ID,Status:3},
this.apiJavaPost("/api/Authorize/UpdateAuthorize", {
ID: row.ID,
Status: 3
},
res => {
if (res.data.resultCode === 1) {
this.msg.Status =3
this.msg.Status = 3
this.getList();
this.Success(res.data.message)
} else {
......@@ -178,18 +177,20 @@ export default {
}
},
}
}
</script>
<style scoped>
.spotquery{
.spotquery {
box-sizing: border-box;
}
.groupempowerman{
}
.groupempowerman {
display: flex;
flex-direction: column;
align-items: flex-start;
}
}
</style>
src/components/assetsman/BulkImport.vue
View file @ 9a97c946
This diff is collapsed.
src/components/assetsman/outboundApplication.vue
View file @ 9a97c946
......@@ -27,26 +27,17 @@
</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>
......@@ -54,8 +45,8 @@
<th width="75">订单号</th>
<th >出库名称</th>
<th >出库规格</th>
<th>出库名称</th>
<th>出库规格</th>
<th width="75">出库数量</th>
<th width="75">出库状态</th>
......@@ -65,8 +56,10 @@
</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">
<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>
......@@ -74,11 +67,11 @@
<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.OrderNo}}</td>
<td >{{delist.NewGoodsName}}</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">
......@@ -88,13 +81,18 @@
</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">
<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 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 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>
......@@ -107,13 +105,8 @@
</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,18 +185,15 @@
},
mounted() {
this.getList();
},
methods: {
SeeDetails(item,path){
SeeDetails(item, path) {
this.$router.push({
path: path,
query: {
ID:item.ID
ID: item.ID
}
});
},
getList() {
this.loading = true;
......@@ -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/outboundDetails.vue
View file @ 9a97c946
<template>
<div class="outboundDetails">
<div class="routerTitle">
<span class="pageTitle">出库详情 <span @click="Backto" style="position:relative;top:-5px" class="backTo">返回</span></span>
<span
style="display:inline-flex;align-items:center;cursor: pointer;"
class="f12 cd6"
>
<span class="pageTitle">出库详情 <span @click="Backto" style="position:relative;top:-5px"
class="backTo">返回</span></span>
<span style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">
<span style="margin-right:5px"></span>
</span>
......@@ -68,13 +66,12 @@
<!-- #e2e2e2 -->
<div>
<vxe-table stripe style="margin-top:15px" :loading="loading"
:data="tableData.WarehouseOutGoodsList" >
<vxe-table stripe style="margin-top:15px" :loading="loading" :data="tableData.WarehouseOutGoodsList">
<vxe-table-column field="OrderNo" title="订单号" width='300'></vxe-table-column>
<vxe-table-column field="GoodsName" title="商品名称"></vxe-table-column>
<vxe-table-column field="Specification" title="规格" width='250'></vxe-table-column>
<vxe-table-column field="Number" title="数量" width='100'> </vxe-table-column>
<vxe-table-column field="NewGoodsName" title="出库商品" ></vxe-table-column>
<vxe-table-column field="NewGoodsName" title="出库商品"></vxe-table-column>
<vxe-table-column field="NewSpecification" title="出库规格" width='250'></vxe-table-column>
<vxe-table-column field="NewNumber" title="出库数量" width='100'> </vxe-table-column>
<vxe-table-column field="Name" title="出库状态" width='180'>
......@@ -92,11 +89,7 @@
</div>
<el-dialog
:title="isagree==2?'同意申请':'拒绝申请'"
:close-on-click-modal="false"
top="0"
:visible.sync="dialogState"
<el-dialog :title="isagree==2?'同意申请':'拒绝申请'" :close-on-click-modal="false" top="0" :visible.sync="dialogState"
width="400px">
<el-form class="MyEditForm" label-width="0">
<el-form-item prop="Name" style="margin-left:60px;">
......@@ -113,24 +106,23 @@
</template>
<script>
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "outboundDetails",
data() {
return {
loading:false,
tableData:[],
loading: false,
tableData: [],
morequery: false,
Updatemsg:{
ID:0,
ExamineReason:'',
ApplyStatus:0
Updatemsg: {
ID: 0,
ExamineReason: '',
ApplyStatus: 0
},
total:0,
isagree:1, //同意为2 拒绝为3
dialogState:false,
total: 0,
isagree: 1, //同意为2 拒绝为3
dialogState: false,
};
},
mounted() {
......@@ -138,7 +130,7 @@ export default {
},
methods: {
Backto(){
Backto() {
this.$router.push({
path: "/outboundApplication"
});
......@@ -147,12 +139,13 @@ export default {
this.loading = true;
this.apiJavaPost(
"/api/WarehouseOut/GetWarehouseOutApply",
{ID:this.$route.query.ID},
"/api/WarehouseOut/GetWarehouseOutApply", {
ID: this.$route.query.ID
},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
if(res.data.data!=null){
if (res.data.data != null) {
this.tableData = res.data.data;
}
......@@ -163,25 +156,21 @@ export default {
},
null
);
},
changeNum(row,val){
if(val=='' || val == 0 ){//当输入 空和0 的时候做的处理
changeNum(row, val) {
if (val == '' || val == 0) { //当输入 空和0 的时候做的处理
this.tableData.WarehouseOutGoodsList.forEach(x => {
if(x.ID==row.ID){
x.Number=1
if (x.ID == row.ID) {
x.Number = 1
}
});
}
},
save(){//修改 出库数量保存
console.log( this.tableData)
save() { //修改 出库数量保存
this.apiJavaPost(
"/api/WarehouseOut/UpdateOutGoods",
this.tableData,
res => {
if (res.data.resultCode === 1) {
this.getList();
} else {
......@@ -191,15 +180,15 @@ export default {
null
);
},
See(type){
See(type) {
this.Updatemsg.ID = this.$route.query.ID;
this.Updatemsg.ApplyStatus = type;
this.Updatemsg.ExamineReason = '';
this.isagree =type;
this.dialogState=true
this.isagree = type;
this.dialogState = true
},
submitForm(){
if(this.isagree==3 && this.Updatemsg.ExamineReason.length == 0){
submitForm() {
if (this.isagree == 3 && this.Updatemsg.ExamineReason.length == 0) {
this.Error('请填写理由');
return
}
......@@ -207,9 +196,8 @@ export default {
"/api/WarehouseOut/UpdateWarehouseOutApply",
this.Updatemsg,
res => {
if (res.data.resultCode === 1) {
this.dialogState=false;
this.dialogState = false;
this.Backto()
} else {
this.Error(res.data.message);
......@@ -217,34 +205,38 @@ export default {
},
null
);
}
}
};
};
</script>
<style>
.outboundDetails .MyEditForm .baseform .el-form-item:nth-child(4n) {
.outboundDetails .MyEditForm .baseform .el-form-item:nth-child(4n) {
margin-right: 0;
}
.outboundDetails .zczt1 {
}
.outboundDetails .zczt1 {
background: #ffe4d5;
color: #ffa87c;
}
.outboundDetails .zczt2 {
}
.outboundDetails .zczt2 {
background: #beeff0;
color: #089bab;
}
.outboundDetails .zczt3 {
}
.outboundDetails .zczt3 {
background: #ffd6d5;
color: #ff7874;
}
.outboundDetails .zczt4 {
}
.outboundDetails .zczt4 {
background: #d7d6ff;
color: #7b78ff;
}
.outboundDetails .Commonzczt {
}
.outboundDetails .Commonzczt {
display: inline-block;
width: 24px;
height: 24px;
......@@ -253,27 +245,32 @@ export default {
border-radius: 50%;
font-size: 12px;
font-family: "Microsoft YaHei";
}
.outboundDetails {
}
.outboundDetails {
width: 100%;
height: 100%;
}
.outboundDetails .topkuang{
}
.outboundDetails .topkuang {
padding: 5px 10px;
border:1px solid #e2e2e2;
border: 1px solid #e2e2e2;
background: #e2e2e2;
border-radius: 15px;
margin-right: 25px;
}
.outboundDetails .xiangq{
}
.outboundDetails .xiangq {
padding: 15px 0;
display: flex;
flex-direction: row;
/* align-items: center; */
justify-content: space-between;
}
.outboundDetails .butoons{
}
.outboundDetails .butoons {
/* float: right; */
margin-right: 10px;
}
}
</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>
......@@ -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){
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
......@@ -94,51 +94,51 @@
</template>
<script>
export default {
export default {
name: '',
data(){
return{
imgDig:false,
data() {
return {
imgDig: false,
msg: {
pageIndex: 1,
pageSize: 5,
PropertyId: ""
},
OperationList:[],
total:0,
datainfo:{
ImageList:[],
OperationList: [],
total: 0,
datainfo: {
ImageList: [],
},
PropertyId:'',
detailLoad:false,
imgSrc:'',
PropertyId: '',
detailLoad: false,
imgSrc: '',
}
},
created(){
created() {
},
mounted(){
mounted() {
},
methods:{
openImg(item){
this.imgDig=true;
this.imgSrc=item;
methods: {
openImg(item) {
this.imgDig = true;
this.imgSrc = item;
},
InitData(id){
this.PropertyId=id;
this.msg.PropertyId=id;
InitData(id) {
this.PropertyId = id;
this.msg.PropertyId = id;
this.getDataInfo();
},
getDataInfo(){
getDataInfo() {
this.apiJavaPost(
"/api/Supplies/GetMaterialInfo",
{MaterialId:this.PropertyId},
"/api/Supplies/GetMaterialInfo", {
MaterialId: this.PropertyId
},
res => {
this.OperationLoad = false;
if (res.data.resultCode === 1) {
this.datainfo = res.data.data;
console.log("this.datainfo",this.datainfo)
} else {
this.Error(res.data.message);
}
......@@ -147,11 +147,12 @@ export default {
);
},
},
}
}
</script>
<style>
.wlDetails .imgList img{
.wlDetails .imgList img {
display: inline-block;
width: 120px;
height: 120px;
......@@ -159,35 +160,42 @@ export default {
margin-right: 30px;
overflow: hidden;
position: relative;
}
.wlDetails .CodeDiv{
}
.wlDetails .CodeDiv {
float: right;
}
.wlDetails .baseDiv .desItem:nth-child(3n){
margin-right:10px!important;
}
.wlDetails .desItem p:first-child{
}
.wlDetails .baseDiv .desItem:nth-child(3n) {
margin-right: 10px !important;
}
.wlDetails .desItem p:first-child {
margin-bottom: 4px;
}
.wlDetails .desItem{
}
.wlDetails .desItem {
display: inline-block;
background: #fff;
box-sizing: border-box;
border-radius: 10px;
width: 200px;
margin:10px 10px 0px 0;
padding:6px 10px;
}
.wlDetails .baseTitle{
padding:5px 0;
margin: 10px 10px 0px 0;
padding: 6px 10px;
}
.wlDetails .baseTitle {
padding: 5px 0;
border-bottom: 1px dashed #ccc;
margin-bottom:10px;
margin-bottom: 10px;
font-family: "PingFangR";
}
.wlDetails .right{
}
.wlDetails .right {
width: 100%;
padding:0 10px 0 15px;
padding: 0 10px 0 15px;
box-sizing: border-box;
}
}
</style>
src/components/report/AssetsRecord.vue
View file @ 9a97c946
This diff is collapsed.
src/components/report/codePrint.vue
View file @ 9a97c946
......@@ -7,7 +7,8 @@
<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>
<p style="position:relative;top:-10px"><span @click="getCheckDes(item)"
class="underline">{{ item.PropertyNum }}</span></p>
</li>
</ul>
......@@ -22,15 +23,15 @@
</template>
<script>
import CheckDetails from "@/components/global/CheckDetails.vue";
export default {
import CheckDetails from "@/components/global/CheckDetails.vue";
export default {
name: "assetsList",
components: {
CheckDetails
},
data() {
return {
baseUrl:'http://property.oytour.com',
baseUrl: 'http://property.oytour.com',
CheckDetailState: false,
currentPage: 1,
......@@ -48,23 +49,23 @@ export default {
StartTime: "",
EndTime: ""
},
PropertyId:'',
PropertyId: '',
};
},
mounted() {
if(this.$route.query.msg){
this.msg=JSON.parse(this.$route.query.msg);
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(()=>{
getCheckDes(item) {
this.PropertyId = item.Id;
this.CheckDetailState = true;
setTimeout(() => {
this.$refs.mychild.InitData(this.PropertyId);
},10)
}, 10)
},
getList() {
delete this.msg.pageIndex;
......@@ -75,7 +76,6 @@ export default {
this.msg,
res => {
this.loading = false;
console.log("res",res);
if (res.data.resultCode === 1) {
this.tableData = res.data.data;
} else {
......@@ -88,38 +88,43 @@ export default {
}
};
};
</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