BaoBingLin
/
nrwms_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
暴炳林 2024-08-23 10:21:38 +08:00
parent f37664dd0e
commit cee9dce6db
8 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/billType.js
View File

@ -29,4 +29,16 @@ export function getBillType() {
method: 'post'
})
}
export default { add, edit, del, getBillType }
export function getByPick() {
return request({
url: 'api/billType/getByPick',
method: 'post'
})
}
export function getByAsn() {
return request({
url: 'api/billType/getByAsn',
method: 'post'
})
}
export default { add, edit, del, getBillType,getByPick,getByAsn }

9
src/views/base-data/box/index.vue
View File

@ -71,14 +71,17 @@
/>
</el-select>
</el-form-item>
<el-form-item label="地标" prop="point" >
<el-form-item label="点位" prop="point" >
<el-select v-model="form.point" value-key="id" clearable filterable placeholder="请选择" style="width: 370px;">
<el-option
v-for="item in pointList"
:key="item.id"
:label="item.code"
:value="item"
/>
>
<span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.area.name }}</span>
</el-option>
</el-select>
</el-form-item>
@ -235,7 +238,7 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
return true
},
// 加载地标
// 加载点位
getPoint() {
crudPoint.getPoints(null,null).then(res => {
this.pointList = res.map(function(obj) {

20
src/views/base-data/lampLog/index.vue
View File

@ -7,22 +7,10 @@
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px">
<el-form-item label="ip" prop="ip">
<el-input v-model="form.ip" style="width: 370px;" />
</el-form-item>
<el-form-item label="所属按钮盒">
<el-input v-model="form.buttonBox" style="width: 370px;" />
</el-form-item>
<el-form-item label="按钮编码">
<el-input v-model="form.buttonCode" style="width: 370px;" />
</el-form-item>
<el-form-item label="操作类型">
<el-input v-model="form.operationType" style="width: 370px;" />
</el-form-item>
<el-form-item label="请求内容">
<el-form-item label="扫描数据">
<el-input v-model="form.requestContent" style="width: 370px;" />
</el-form-item>
<el-form-item label="返回内容">
<el-form-item label="成功数据">
<el-input v-model="form.returnContent" style="width: 370px;" />
</el-form-item>
<el-form-item label="返回状态">
@ -37,10 +25,6 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="ip" label="ip" />
<el-table-column prop="buttonBox" label="所属按钮盒" />
<el-table-column prop="buttonCode" label="按钮编码" />
<el-table-column prop="operationType" label="操作类型" />
<el-table-column prop="requestContent" label="请求内容" />
<el-table-column prop="returnContent" label="返回内容" />
<el-table-column prop="returnState" label="返回状态" />

10
src/views/business-data/asn/index.vue
View File

@ -66,14 +66,12 @@
<el-form-item label="登记单号">
<el-input v-model="form.relatedBill2" style="width: 370px;" />
</el-form-item>
<!-- <el-form-item label="订单状态">
<el-input v-model="form.status" style="width: 370px;" />
</el-form-item>-->
<el-form-item label="订单状态" prop="status">
<el-select
v-model="form.status"
filterable
placeholder="订单状态"
:default-first-option="true"
style="width: 370px;"
>
<el-option
@ -144,11 +142,11 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import { getItems } from '@/api/item'
import { getBillType } from '@/api/billType'
import {getBillType, getByAsn, getByPick} from '@/api/billType'
import crudAsnDetail from "@/api/asnDetail";
import DateRangePicker from '@/components/DateRangePicker'
const defaultForm = { id: null, dept: null, billType: null, orderOrigin: null, structure: null, erTime: null, relatedBill1: null, relatedBill2: null, sourceName: null, status: null, address: null, createBy: null, updateBy: null, createTime: null, updateTime: null, orderDate: null }
const defaultForm = { id: null, dept: null, billType: null, orderOrigin: null, structure: null, erTime: null, relatedBill1: null, relatedBill2: null, sourceName: null, status: 'OPEN', address: null, createBy: null, updateBy: null, createTime: null, updateTime: null, orderDate: null }
export default {
name: 'Asn',
components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
@ -214,7 +212,7 @@ export default {
})
},
getBillType() {
getBillType({}).then(res => {
getByAsn({}).then(res => {
this.billTypeList = res.map(function(obj) {
if (obj.hasChildren) {
obj.children = null

23
src/views/business-data/asnDetail/index.vue
View File

@ -44,6 +44,12 @@
</el-form>
<el-divider></el-divider>
<el-input v-model="query.relatedBill1" clearable placeholder="系统单号" style="width: 140px;" class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<el-input v-model="query.itemCode" clearable placeholder="物料" style="width: 140px;" class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<date-range-picker start-placeholder="创建日期" v-model="query.createTime" class="date-item" />
<rrOperation :crud="crud"/>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" :tableKey="this.$options.name">
<el-button
@ -87,7 +93,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="订单数量">
<el-form-item label="订单数量" prop="orderQty">
<el-input v-model="form.orderQty" style="width: 200px;"/>
</el-form-item>
<el-form-item label="收货数量">
@ -180,16 +186,16 @@ import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker'
const defaultForm = {
id: null,
asn:{id:null},
item: null,
stock: null,
lineNo: null,
lineNo: 1,
po: null,
status: 'OPEN',
orderQty: 0,
orderQty: 100,
receivedQty: 0,
moveQty: 0,
putQty: 0,
@ -215,7 +221,7 @@ const defaultForm = {
export default {
name: 'AsnDetail',
// eslint-disable-next-line vue/no-unused-components
components: { pagination, crudOperation, rrOperation, udOperation },
components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['asn_status'],
cruds() {
@ -246,8 +252,11 @@ export default {
download: ['admin', 'asnDetail:download']
},
rules: {
code: [
{ required: true, message: '库区编号不能为空', trigger: 'blur' }
item: [
{ required: true, message: '必填', trigger: 'blur' }
],
lineNo: [
{ required: true, message: '必填', trigger: 'blur' }
]
},
itemList:[],

14
src/views/business-data/businessTask/asnTask.vue
View File

@ -16,7 +16,7 @@
</el-select>
<el-input v-model="query.itemName" clearable placeholder="物料名称" style="width: 140px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-select
v-model="query.agvStatus"
v-model="query.taskStatus"
clearable
size="small"
placeholder="任务状态"
@ -25,7 +25,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.task_status"
v-for="item in dict.asn_task_status"
:key="item.id"
:label="item.label"
:value="item.value"
@ -150,10 +150,10 @@
<el-input v-model="fromManualReceiving.RFID" :rows="3" type="textarea" style="width: 350px;" @change="devan_rfid()"/>
</el-form-item>
<el-form-item label="登记单号" prop="relatedBill2">
<el-input v-model="fromManualReceiving.relatedBill2" :disabled="true" style="width: 100px;"/>
<el-input v-model="fromManualReceiving.relatedBill2" :disabled="true" style="width: 200px;"/>
</el-form-item>
<el-form-item label="系统单号" prop="relatedBill1">
<el-input v-model="fromManualReceiving.relatedBill1" :disabled="true" style="width: 100px;"/>
<el-input v-model="fromManualReceiving.relatedBill1" :disabled="true" style="width: 200px;"/>
</el-form-item>
<el-form-item label="sku" prop="sku">
<el-input v-model="fromManualReceiving.sku" :disabled="true" style="width: 330px;"/>
@ -200,8 +200,8 @@
</el-table-column>
<el-table-column prop="agvStatus" label="任务状态">
<template slot-scope="scope">
<span v-if="dict.label.asn_status[scope.row.taskStatus] ==null">{{ scope.row.taskStatus }}</span>
<span v-if="scope.row.taskStatus !=null">{{ dict.label.asn_status[scope.row.taskStatus] }}</span>
<span v-if="dict.label.asn_task_status[scope.row.taskStatus] ==null">{{ scope.row.taskStatus }}</span>
<span v-if="scope.row.taskStatus !=null">{{ dict.label.asn_task_status[scope.row.taskStatus] }}</span>
</template>
</el-table-column>
<el-table-column prop="srcPointCode" label="原点位">
@ -259,7 +259,7 @@ export default {
name: 'Task',
components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['task_status','asn_status'],
dicts: ['asn_task_status'],
cruds() {
return CRUD({
query: {taskType: ['FC_RK','SM_RK','RM_RK']},

4
src/views/business-data/pick/index.vue
View File

@ -155,7 +155,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import {getBillType} from "@/api/billType";
import {getBillType, getByPick } from "@/api/billType";
const defaultForm = { id: null, deptId: null, billType: null, orderOrigin: null, priority: null, owner: null, relatedBill1: null, relatedBill2: null, sourceName: null, status: null, address: null, dispatchDate: null, erTime: null, createBy: null, updateBy: null, createTime: null, updateTime: null, orderDate: null }
export default {
@ -202,7 +202,7 @@ export default {
return true
},
getBillType() {
getBillType({}).then(res => {
getByPick().then(res => {
this.billTypeList = res.map(function(obj) {
if (obj.hasChildren) {
obj.children = null

13
src/views/business-data/pickDetail/pickTask.vue
View File

@ -3,7 +3,7 @@
<!--工具栏-->
<div class="head-container">
<!-- <el-input v-model="query.itemCode" clearable placeholder="物料代码" style="width: 140px;" class="filter-item" @keyup.enter.native="crud.toQuery" />-->
<el-select v-model="query.itemCode" filterable placeholder="物料代码" style="width: 140px;" class="filter-item">
<el-select v-model="query.itemCode" clearable placeholder="物料代码" style="width: 140px;" @change="crud.toQuery" class="filter-item">
<el-option
@keyup.enter.native="crud.toQuery"
v-for="item in this.itemListData"
@ -25,7 +25,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.pick_status"
v-for="item in dict.pick_task_status"
:key="item.id"
:label="item.label"
:value="item.value"
@ -137,8 +137,8 @@
<el-table-column prop="dstPoint.code" label="目标点位" />
<el-table-column prop="taskStatus" label="任务状态">
<template slot-scope="scope">
<span v-if="dict.label.pick_status[scope.row.taskStatus] ==null">{{ scope.row.taskStatus }}</span>
<span v-if="scope.row.taskStatus !=null">{{ dict.label.pick_status[scope.row.taskStatus] }}</span>
<span v-if="dict.label.pick_task_status[scope.row.taskStatus] ==null">{{ scope.row.taskStatus }}</span>
<span v-if="scope.row.taskStatus !=null">{{ dict.label.pick_task_status[scope.row.taskStatus] }}</span>
</template>
</el-table-column>
<el-table-column prop="agvTask" label="AGV搬运任务">
@ -191,7 +191,7 @@ export default {
name: 'Task',
components: {Inventory, DateRangePicker, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['pick_status'],
dicts: ['pick_task_status'],
cruds() {
return CRUD({ query:{taskType:['RM_CK','FC_CK','SM_CK']}, title: '出库任务', url: 'api/task', idField: 'id', sort: 'id,desc', crudMethod: { ...crudTask },
optShow: {
@ -261,11 +261,12 @@ export default {
return index * 1+1;
},
defaultTableList() {
let statusList=[];
/*let statusList=[];
statusList.push('OPEN')
statusList.push('ALLOCATE')
statusList.push('PICKUP')
this.query.statusList = statusList
this.crud.toQuery()*/
this.crud.toQuery()
},
queryInventoryFrom(itemId){