修改站台盘点

泸州-烟草
LAPTOP-S9HJSOEB\昊天 1 year ago
parent cb1dbf9253
commit 3d9ce36452

Binary file not shown.

@ -1395,7 +1395,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
.ant-tag-green-inverse {color: #fff;background: #52c41a;border-color: #52c41a;}
.ant-tag-blue {color: #1890ff;background: #e6f7ff;border-color: #91d5ff;}
.ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;}
.ant-tag-geekblue {color: #2f54eb;background: color(~`colorPalette("@{heading-color}", 1)`);border-color: #adc6ff;}
.ant-tag-geekblue {color: #2f54eb;background: #f0f5ff;border-color: #adc6ff;}
.ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;}
.ant-tag-purple {color: #722ed1;background: #f9f0ff;border-color: #d3adf7;}
.ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;}

@ -208,6 +208,12 @@ export default {
name: '盘点历史',
method: 'POST'
},
KuKouControllerlist: {
url: '/KuKouController/list',
name: '站台盘点历史',
method: 'POST'
},
stockLog: {
url: '/stockLog',
name: '库存历史',

@ -90,7 +90,7 @@ const routes = [{
name: 'platformCheckManage',
meta: {
icon: 'form',
name: '站盘点',
name: '站盘点',
},
component: () => import('@/views/platformCheck/index'),
},
@ -99,7 +99,7 @@ const routes = [{
name: 'platformCheckManageOld',
meta: {
icon: 'form',
name: '站盘点历史',
name: '站盘点历史',
},
component: () => import('@/views/platformCheck/old/index'),
},

@ -4,99 +4,43 @@
<div style="display:flex">
<div style="margin-left: 10px,width:100,height:200,float:left">
<ul style="width:400,line-height:40">
<li>
<span class="img-box-title">
{{street.name}}-{{realCheck.direction == ''?'左右':(realCheck.direction == 1?"左":"右")}}-{{realCheck.side == ''?'深浅':(realCheck.side == 1?"浅":"深")}}-{{realCheck.row}}-{{realCheck.column}}
</span>
</li>
<li>
<span class="img-box-title">
核对状态:{{realCheck.status == 1?"盘点正确":"盘点异常"}}
</span>
</li>
<li>
<span class="img-box-title">
系统条码:{{realCheck.WMSCode}}
核对状态:{{realCheck.flag == 1?"盘点正确":"盘点异常"}}
</span>
</li>
<li>
<span class="img-box-title">
盘点结果条码:{{realCheck.checkCode}}
系统条码:{{realCheck.code}}
</span>
</li>
<li>
<span class="img-box-title">
系统品规:
系统品规:{{realCheck.categoryName}}
</span>
</li>
<li>
<span class="img-box-title">
盘点结果品规:
盘点结果数量:{{realCheck.count}}
</span>
</li>
<li>
<span class="img-box-title">
系统数量:{{realCheck.WMSCount}}
</span>
</li>
<li>
<span class="img-box-title">
盘点结果数量:{{realCheck.checkCode}}
</span>
</li>
<li>
<span class="img-box-title">
盘点时间:{{realCheck.time}}
盘点时间:{{realCheck.createTime}}
</span>
</li>
</ul>
</div>
<div >
<div style="width: 70%;">
<a-row type="flex" justify="space-around" style="height:300,margin-left:400">
<a-col :span="4">
<p>顶部图片1</p>
<viewer >
<img class="historyImg" :src="realCheck.topPic1"/>
</viewer>
</a-col>
<a-col :span="4">
<p>顶部图片2</p>
<viewer >
<img class="historyImg" :src="realCheck.topPic2"/>
<img class="historyImg" :src="realCheck.path"/>
</viewer>
</a-col>
</a-row>
<a-row type="flex" justify="space-around" align="middle" style="height:300">
<a-col :span="4">
<p>侧面图片1</p>
<viewer >
<img class="historyImg" :src="realCheck.sidePic1"/>
</viewer>
</a-col>
<a-col :span="4">
<p>侧面图片2</p>
<viewer >
<img class="historyImg" :src="realCheck.sidePic2"/>
</viewer>
</a-col>
</a-row>
<a-row type="flex" justify="space-around" align="middle" style="height:300">
<a-col :span="4">
<p>侧面图片3</p>
<viewer >
<img class="historyImg" :src="realCheck.sidePic3"/>
</viewer>
</a-col>
<a-col :span="4">
<p>侧面图片4</p>
<viewer >
<img class="historyImg" :src="realCheck.sidePic4"/>
</viewer>
</a-col>
</a-row>
</div>
@ -186,16 +130,16 @@ export default {
},
handleChange(value) {
this.street = value
//this.street = value
console.log("street:"+this.street);
this.getRealTimeCheck();
},
getRealTimeCheck(){
console.log("SRMNUmber:"+this.SRMNumber);
this.$axios.get('/clientTest/realtimeCheck', {
params: {SRMNumber:this.SRMNumber}
//console.log("SRMNUmber:"+this.SRMNumber);
this.$axios.get('/KuKouController/latest', {
params: {}
}).then(res => {
if (res.code == 200) {
if(res.data != null){

@ -1,89 +1,6 @@
<template>
<div class="history bg-white">
<div class="ant-advanced-search-form">
<a-form layout="inline" :form="queryParam">
<a-row :gutter="24">
<a-col :span="4">
<a-form-item label="巷道">
<a-select @change="handleChange" :value="select" style="width:100px">
<a-select-option v-for="i in listData" :key="i.name" :value="i.id">
{{i.name}}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="2">
<a-form-item label="左右">
<a-select v-model="queryParam.leftRight" @change="leftRightChange" >
<a-select-option :value=-1>
未选择
</a-select-option>
<a-select-option :value=1>
左侧
</a-select-option>
<a-select-option :value=2>
右侧
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="2">
<a-form-item label="深浅" v-if="queryParam.side >= 0">
<a-select style="width: 50px" :key="queryParam.side" >
<a-select-option :key=-1>
未选择
</a-select-option>
<a-select-option :key=1>
</a-select-option>
<a-select-option :key=2>
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="2" style="text-align: left">
<a-form-item label="行号">
<a-input v-model="queryParam.row" placeholder="请输入" style="width:50px;" type="number"/>
</a-form-item>
</a-col>
<a-col :span="2" style="text-align: left">
<a-form-item label="列号">
<a-input v-model="queryParam.column" placeholder="请输入" style="width:50px;" type="number"/>
</a-form-item>
</a-col>
<a-col :span="4" style="text-align: left">
<a-form-item label="盘点号">
<a-input v-model="queryParam.lotnum" placeholder="请输入" />
</a-form-item>
</a-col>
<a-col :span="4">
<a-form-item label="时间">
<a-range-picker
@change="onTimeChange"
v-model="time"
format="YYYY-MM-DD HH:mm"
:show-time="{
defaultValue: [moment('00:00', 'HH:mm'), moment('23:59', 'HH:mm')],
//defaultValue: [moment('00:00', 'YYYY-MM-DD HH:mm'), moment('23:59', 'YYYY-MM-DD HH:mm')],
}"
>
<a-icon slot="suffixIcon" type="calendar"/>
</a-range-picker>
</a-form-item>
</a-col>
<a-col :span="4" style="text-align: right">
<a-button type="primary" @click="handleSearch"></a-button>
<a-button style="margin-left: 15px" @click="reset"></a-button>
</a-col>
</a-row>
</a-form>
</div>
<a-table
:columns="columns"
@ -92,21 +9,19 @@
:pagination="pagination"
@change="handleGetHistoryList"
>
<span slot="checkNum" slot-scope="text">
{{ text }}
</span>
<span slot="goodsLocation" slot-scope="text">
{{ text.direction == 1 ?"左":"右"}}-{{ text.side == 1 ?"浅":"深"}}-{{ text.row}}-{{ text.column}}
</span>
<span slot="status" slot-scope="text">
{{ statusMap[text.status] }}
{{realCheck.flag == 1?"盘点正确":"盘点异常"}}
</span>
<span slot="pic" slot-scope="text" style="width:auto">
<template>
<span style="height:100%;">
<happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="width:320px;height:90px;">
<viewer><img class="historyImg" :src="imgUrl+text.pic"/></viewer>
<viewer :images="text.pics">
<img class="historyImg" v-for="(src,index) in text.pics" :src="imgUrl+src"
:key="index"/>
</viewer>
</happy-scroll>
</span>
@ -147,25 +62,18 @@ export default {
},
imgUrl: imgUrl,
columns: [
{
title: "盘点批次号",
dataIndex: "lotnum",
},
{
title: "货位({左右}-{深浅}-{行}-{列})",
scopedSlots: {customRender: 'goodsLocation'},
},
{
title: "系统托盘条码号",
dataIndex: "wmsTrayCode",
title: "条码",
dataIndex: "code",
},
{
title: "扫描托盘条码号",
dataIndex: "trayCode",
title: "品规",
dataIndex: "categoryName",
},
{
title: "盘点状态",
scopedSlots: {customRender: 'status'},
title: "数量",
dataIndex: "count",
},
{
title: "照片",
@ -181,7 +89,7 @@ export default {
}
},
mounted() {
this.getStreetList();
//this.getStreetList();
this.handleSearch();
},
methods: {
@ -249,7 +157,7 @@ export default {
this.request();
},
request() {
this.$api.httpApi.checkLog({
this.$api.httpApi.KuKouControllerlist({
data: {
pageNum: this.pageNum,
pageSize: this.pageSize,

Loading…
Cancel
Save