renren/qy-renren-qt
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
朱文强 2023-04-10 11:00:18 +08:00
parent ac4878cfeb
commit ff8adae814
8 changed files with 173 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
src/views/modules/work/OperationMonitor.vue
View File

@ -2,76 +2,95 @@
* @Author: zwq * @Author: zwq
* @Date: 2022-05-31 15:49:03 * @Date: 2022-05-31 15:49:03
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2023-03-10 11:33:12 * @LastEditTime: 2023-04-03 15:13:47
* @Description: * @Description:
--> -->
<template> <template>
<div> <div>
<el-tabs @tab-click="handleClick" style="margin-top:-30px"> <el-tabs
<el-tab-pane label="A库"></el-tab-pane> @tab-click="handleClick"
<el-tab-pane label="B库"></el-tab-pane> v-model="dataForm.warehouseName"
<div style="margin-top:-30px"
style="width:100%;height:100%;border-bottom:1px dotted #ff0000;padding-bottom:10px"
> >
<el-row :gutter="20"> <el-tab-pane name="A">
<span slot="label" style="font-size:20px"><b>A库</b></span>
</el-tab-pane>
<el-tab-pane name="B">
<span slot="label" style="font-size:20px"><b>B库</b></span>
</el-tab-pane>
<div
style="width:100%;height:100%;border-bottom:1px dotted #ff0000;padding-bottom:10px"
>
<el-row :gutter="20">
<el-col :span="24">
<div class="zhigui" id="zhigui">
<div class="car" id="car"></div>
</div>
</el-col>
</el-row>
</div>
<el-row :gutter="20" style="margin-top:5px">
<el-col :span="24"> <el-col :span="24">
<div class="zhigui" id="zhigui"> <div class="wareBody">
<div class="car" id="car"></div> <div
v-for="(item, index) in shelfArr.filter(item => {
return item.direction === 1;
})"
:key="index"
class="shelfBox"
ref="shelfBox"
v-bind:class="[
item.isOccupy === 0 ? 'normalShelfBox' : 'deliveryShelfBox'
]"
@click="addOutTask(item.id, item.anotherName,item.isOccupy)"
>
<div>
<span>{{ item.anotherName }}</span
><br />
<span>{{ item.productCode }}</span
><br />
<span>{{ item.quantity }}</span>
</div>
</div>
</div>
<el-row :gutter="20" style="margin:5px">
<el-col :span="5" :offset="7">
<b>1-1-1 代表</b>
1排1层1列位
</el-col>
<el-col :span="3">
<div class="tip empty"></div>
空闲
</el-col>
<el-col :span="3">
<div class="tip"></div>
有货
</el-col>
</el-row>
<div class="wareBody">
<div
v-for="(item, index) in shelfArr.filter(item => {
return item.direction === -1;
})"
:key="index"
class="shelfBox"
ref="shelfBox"
v-bind:class="[
item.isOccupy === 0 ? 'normalShelfBox' : 'deliveryShelfBox'
]"
@click="addOutTask(item.id, item.anotherName,item.isOccupy)"
>
<div>
<span>{{ item.anotherName }}</span
><br />
<span>{{ item.productCode }}</span
><br />
<span>{{ item.quantity }}</span>
</div>
</div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</div>
<div class="wareBody">
<div
v-for="(item, index) in shelfArr.filter(item => {
return item.direction === '1';
})"
:key="index"
class="shelfBox"
ref="shelfBox"
v-bind:class="[
item.isOccupy === 0 ? 'normalShelfBox' : 'deliveryShelfBox'
]"
@click="getInfo(item.id, item.isOccupy)"
>
<el-popover trigger="click" word-wrap placement="top-start">
<label>{{ item.anotherName }}</label
><br />
<label>编码:{{ shelfInfo.productCode }}</label
><br />
<label>数量:{{ shelfInfo.quantity }}</label>
<div slot="reference">
<span>{{ item.anotherName }}</span>
</div>
</el-popover>
</div>
</div>
<div class="line">-- --</div>
<div class="wareBody">
<div
v-for="(item, index) in shelfArr.filter(item => {
return item.direction === '-1';
})"
:key="index"
class="shelfBox"
ref="shelfBox"
v-bind:class="[
item.isOccupy === 0 ? 'normalShelfBox' : 'deliveryShelfBox'
]"
@click="getInfo(item.id, item.isOccupy)"
>
<el-popover trigger="click" word-wrap placement="top-start">
<label>{{ item.anotherName }}</label
><br />
<label>编码:{{ shelfInfo.productCode }}</label
><br />
<label>数量:{{ shelfInfo.quantity }}</label>
<div slot="reference">
<span>{{ item.anotherName }}</span>
</div>
</el-popover>
</div>
</div>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
@ -83,7 +102,13 @@ export default {
shelfArr: [], shelfArr: [],
car: '', car: '',
zhigui: '', zhigui: '',
shelfInfo: {} shelfInfo: {},
dataForm: {
warehouseName: 'A',
taskType: 0,
startPosition: '',
endPosition: ''
}
} }
}, },
created () {}, created () {},
@ -131,6 +156,36 @@ export default {
this.$message.error('该位置无货') this.$message.error('该位置无货')
} }
}, },
addOutTask (id, anotherName, isOccupy) {
if (isOccupy) {
this.$confirm(`确定对[${anotherName}]进行出库操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.dataForm.startPosition = id
this.dataForm.endPosition =
this.dataForm.warehouseName === 'A' ? 290 : 292
this.$http({
url: this.$http.adornUrl('/work/mttaskinfo/saveout'),
method: 'post',
data: this.$http.adornData(this.dataForm)
}).then(({ data }) => {
if (data && data.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
})
} else {
this.$message.error(data.msg)
}
})
})
} else {
this.$message.error('该位置无货')
}
},
handleClick (tab) { handleClick (tab) {
if (tab.index === '0') { if (tab.index === '0') {
this.getList('A') this.getList('A')
@ -167,7 +222,7 @@ export default {
<style scoped> <style scoped>
.zhigui { .zhigui {
height: 250px; height: 240px;
background: url("../../../assets/1.png") repeat; background: url("../../../assets/1.png") repeat;
background-size: 100% 100%; background-size: 100% 100%;
padding-top: 100px; padding-top: 100px;
@ -185,16 +240,16 @@ export default {
flex-wrap: wrap; flex-wrap: wrap;
min-width: 1200px; min-width: 1200px;
position: relative; position: relative;
padding: 15px; padding: 12px;
} }
.shelfBox { .shelfBox {
width: 5.5%; width: 5.5%;
height: 55px; height: 57px;
padding: 5px 8px; padding: 1px;
border: 2px solid #cdcdc5; border: 2px solid #cdcdc5;
border-radius: 5px; border-radius: 5px;
line-height: 18px; line-height: 18px;
text-align: center; font-size: 12px;
color: white; color: white;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
@ -224,4 +279,15 @@ export default {
border-right: 500px solid rgb(137, 139, 131); border-right: 500px solid rgb(137, 139, 131);
text-align: center; text-align: center;
} }
.tip {
width: 20px;
height: 16px;
margin-right: 5px;
border-radius: 5px;
float: left;
background-color: #e2a448;
}
.empty {
background-color: #09bb07;
}
</style> </style>

4
src/views/modules/work/mtalarmlog.vue
View File

@ -29,12 +29,12 @@
align="center" align="center"
label="添加时间"> label="添加时间">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
prop="updateTime" prop="updateTime"
header-align="center" header-align="center"
align="center" align="center"
label="修改时间"> label="修改时间">
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
prop="alarmGrade" prop="alarmGrade"
header-align="center" header-align="center"

7
src/views/modules/work/mttaskinfo.vue
View File

@ -56,7 +56,12 @@
align="center" align="center"
label="状态"> label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.status === 0?'接收数据' :scope.row.status === 1?'数据接收中': scope.row.status === 2?'数据接收完成':'等待接收数据'}}</span> <span>{{
scope.row.status === 0?'未执行'
:scope.row.status === 1?'执行中'
:scope.row.status === 2?'执行完成'
:scope.row.status === 3?'送达滚筒':'执行失败'
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

11
src/views/modules/work/mttaskinfodet.vue
View File

@ -104,12 +104,11 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
scope.row.status === 0 scope.row.status === 0?'未执行'
? "接收数据" :scope.row.status === 1?'执行中'
: scope.row.status === 1 :scope.row.status === 2?'执行完成'
? "数据接收中" :scope.row.status === 3?'送达滚筒':'执行失败'
: "数据接收完成" }}</span>
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

9
src/views/modules/work/mttaskinfodetlog.vue
View File

@ -74,8 +74,13 @@
align="center" align="center"
label="状态"> label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.status === 0?'接收数据' :scope.row.status === 1?'数据接收中': '数据接收完成'}}</span> <span>{{
</template> scope.row.status === 0?'未执行'
:scope.row.status === 1?'执行中'
:scope.row.status === 2?'执行完成'
:scope.row.status === 3?'送达滚筒':'执行失败'
}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskDetCode" prop="taskDetCode"

14
src/views/modules/work/mttaskinfolog.vue
View File

@ -62,7 +62,12 @@
align="center" align="center"
label="状态"> label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.status === 0?'接收数据' :scope.row.status === 1?'接收中': scope.row.status === 2?'接收完成':'等待接收'}}</span> <span>{{
scope.row.status === 0?'未执行'
:scope.row.status === 1?'执行中'
:scope.row.status === 2?'执行完成'
:scope.row.status === 3?'送达滚筒':'执行失败'
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -83,6 +88,13 @@
align="center" align="center"
label="具体型号"> label="具体型号">
</el-table-column> </el-table-column>
<el-table-column
prop="warehousRankName"
header-align="center"
align="center"
label="库位名称"
>
</el-table-column>
<el-table-column <el-table-column
prop="num" prop="num"
header-align="center" header-align="center"

10
src/views/modules/work/mtwarehouspositionrelatlog.vue
View File

@ -29,12 +29,12 @@
align="center" align="center"
label="添加时间"> label="添加时间">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
prop="updateTime" prop="updateTime"
header-align="center" header-align="center"
align="center" align="center"
label="修改时间"> label="修改时间">
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
prop="status" prop="status"
header-align="center" header-align="center"
@ -45,8 +45,8 @@
'空库位' :scope.row.status === 1? '空库位' :scope.row.status === 1?
'空货架':scope.row.status === 2? '空货架':scope.row.status === 2?
'货物正常':scope.row.status === 3? '货物正常':scope.row.status === 3?
'货物预入库':scope.row.status === 4? '入库':scope.row.status === 5?
'货物预出库': '不可用'}}</span> '出库': '不可用'}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -83,7 +83,7 @@
label="货物数量"> label="货物数量">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="warehousPositionName" prop="warehousePositionName"
header-align="center" header-align="center"
align="center" align="center"
label="库位名称"> label="库位名称">

4
static/config/index-prod.js
View File

@ -2,7 +2,7 @@
* @Author: gtz * @Author: gtz
* @Date: 2021-11-19 10:10:52 * @Date: 2021-11-19 10:10:52
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-05-23 10:10:52 * @LastEditTime: 2023-04-03 15:22:27
* @Description: file content * @Description: file content
* @FilePath: \mt-qj-wms-ui\static\config\index-prod.js * @FilePath: \mt-qj-wms-ui\static\config\index-prod.js
*/ */
@ -13,7 +13,7 @@
window.SITE_CONFIG = {} window.SITE_CONFIG = {}
// api接口请求地址 // api接口请求地址
window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.16:8089/wms-qy/' window.SITE_CONFIG['baseUrl'] = '/api'
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './' // 域名 window.SITE_CONFIG['domain'] = './' // 域名