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

no message

main
暴炳林 2025-01-15 15:07:08 +08:00
parent fb15a9c7b0
commit 8d54774396
5 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/base-data/item/index.vue
View File

@ -57,7 +57,7 @@
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="form.name" style="width: 180px;"/> <el-input v-model="form.name" style="width: 180px;"/>
</el-form-item> </el-form-item>
<el-form-item label="预期占用数"> <el-form-item label="整托数">
<el-input v-model="form.extendD1" style="width: 180px;"/> <el-input v-model="form.extendD1" style="width: 180px;"/>
</el-form-item> </el-form-item>
<el-form-item label="存储库区" prop="goodType"> <el-form-item label="存储库区" prop="goodType">
@ -129,7 +129,7 @@
<el-table-column prop="name" label="名称" width="150"/> <el-table-column prop="name" label="名称" width="150"/>
<el-table-column prop="goodType" label="存储库区" width="150"> <el-table-column prop="goodType" label="存储库区" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="extendD1" label="预期占用数"/> <el-table-column prop="extendD1" label="整托数"/>
<el-table-column prop="unit" label="单位"> <el-table-column prop="unit" label="单位">
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.item_unit[scope.row.unit] }} {{ dict.label.item_unit[scope.row.unit] }}

17
src/views/base-data/point/index.vue
View File

@ -258,7 +258,15 @@
<el-form-item label="描述"> <el-form-item label="描述">
<el-input type="textarea" v-model="form.description" style="width: 370px;"/> <el-input type="textarea" v-model="form.description" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="坐标X">
<el-input type="beatCode" v-model="form.posX" style="width: 100px;"/>
</el-form-item>
<el-form-item label="坐标Y">
<el-input type="beatCode" v-model="form.posY" style="width: 100px;"/>
</el-form-item>
<el-form-item label="坐标Z">
<el-input type="beatCode" v-model="form.posZ" style="width: 100px;"/>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="crud.cancelCU">取消</el-button> <el-button @click="crud.cancelCU">取消</el-button>
@ -317,6 +325,9 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="posX" label="坐标X" />
<el-table-column prop="posY" label="坐标Y" />
<el-table-column prop="posZ" label="坐标Z" />
<el-table-column fixed="right" <el-table-column fixed="right"
v-if="checkPer(['admin','item:edit'])" label="操作" width="60px" align="center"> v-if="checkPer(['admin','item:edit'])" label="操作" width="60px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -356,7 +367,7 @@ import pointUrl from '@/api/point'
import multiAdjust from "@/views/base-data/point/multiAdjust.vue"; import multiAdjust from "@/views/base-data/point/multiAdjust.vue";
import {getStockTypes} from "@/api/stockType"; import {getStockTypes} from "@/api/stockType";
const defaultForm = {id: null,agvStatus: null, status: 'FREE', enabled: 1, code: null, name: null, description: null, area: null, storageType: null,beatCode: null,heat: null} const defaultForm = {id: null,agvStatus: null, status: 'FREE', enabled: 1, code: null, name: null, description: null, area: null, storageType: null,beatCode: null,heat: null,posX:null,posY:null,posZ:null}
export default { export default {
name: 'Point', name: 'Point',
components: { components: {
@ -367,7 +378,7 @@ export default {
dicts: ['base_staus', 'use_status', 'point_type', 'agv_on_off', 'smallArea'], dicts: ['base_staus', 'use_status', 'point_type', 'agv_on_off', 'smallArea'],
cruds() { cruds() {
return CRUD({ return CRUD({
title: '点位', url: 'api/point', idField: 'id', sort: 'id,desc', crudMethod: {...crudPoint}, title: '点位', url: 'api/point', idField: 'id', sort: 'enabled,code,desc', crudMethod: {...crudPoint},
optShow: { optShow: {
add: true, add: true,
edit: true, edit: true,

3
src/views/business-data/businessTask/agvTask.vue
View File

@ -35,7 +35,8 @@
:value="taskType.value" :value="taskType.value"
/> />
</el-select> </el-select>
<el-input v-model="query.jobPriorityType" clearable placeholder="执行时长/分钟" style="width: 220px;"
class="filter-item" @keyup.enter.native="crud.toQuery"/>
<rrOperation :crud="crud"/> <rrOperation :crud="crud"/>
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->

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

@ -25,7 +25,7 @@
@change="crud.toQuery" @change="crud.toQuery"
> >
<el-option <el-option
v-for="item in dict.asn_task_status" v-for="item in dict.asn_status"
:key="item.id" :key="item.id"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
@ -57,7 +57,7 @@
size="mini" size="mini"
icon="el-icon-document-add" icon="el-icon-document-add"
v-show="true" v-show="true"
@click="ManualReceivingFlag=true;AsnType='BOX';agvFlag=1" @click="ManualReceivingFlag=true;fromManualReceiving.RFID='' ;AsnType='BOX';agvFlag=1"
> >
AGV入库 AGV入库
</el-button> </el-button>
@ -200,8 +200,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="agvStatus" label="任务状态"> <el-table-column prop="agvStatus" label="任务状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="dict.label.asn_task_status[scope.row.taskStatus] ==null">{{ scope.row.taskStatus }}</span> <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_task_status[scope.row.taskStatus] }}</span> <span v-if="scope.row.taskStatus !=null">{{ dict.label.asn_status[scope.row.taskStatus] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="srcPointCode" label="原点位"> <el-table-column prop="srcPointCode" label="原点位">
@ -259,7 +259,7 @@ export default {
name: 'Task', name: 'Task',
components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation}, components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['asn_task_status'], dicts: ['asn_status'],
cruds() { cruds() {
return CRUD({ return CRUD({
query: {taskType: ['FC_RK','SM_RK','RM_RK']}, query: {taskType: ['FC_RK','SM_RK','RM_RK']},

12
src/views/business-data/inventory/index.vue
View File

@ -53,6 +53,14 @@
class="filter-item" class="filter-item"
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
<el-input
v-model="query.itemKeyPropC7"
clearable
placeholder="标签码"
style="width: 300px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<rrOperation :crud="crud" /> <rrOperation :crud="crud" />
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@ -90,13 +98,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="数量"> <el-form-item label="数量">
<el-input v-model="form.quantity" :disabled="true" style="width: 100px;" /> <el-input v-model="form.quantity" :disabled="false" style="width: 100px;" />
</el-form-item> </el-form-item>
<el-form-item label="分配数"> <el-form-item label="分配数">
<el-input v-model="form.queuedQty" :disabled="true" style="width: 100px;" /> <el-input v-model="form.queuedQty" :disabled="true" style="width: 100px;" />
</el-form-item> </el-form-item>
<el-form-item label="RFID"> <el-form-item label="RFID">
<el-input v-model="form.itemKey.propC7" :rows="3" type="textarea" style="width: 370px;" /> <el-input v-model="form.itemKey.propC7" :disabled="false" :rows="3" type="textarea" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="描述"> <el-form-item label="描述">
<el-input v-model="form.description" :rows="3" type="textarea" style="width: 370px;" /> <el-input v-model="form.description" :rows="3" type="textarea" style="width: 370px;" />