root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/yongYuJiaJu

Browse Source
This commit is contained in:
ldj_willow
2022-10-26 11:00:55 +08:00
parent e55a9f35a1 19f29989c1
commit 43435792ba
23 changed files with 543 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -168,6 +168,22 @@
/>
</el-select>
</el-form-item>
<el-form-item label="工单状态">
<el-select
v-model="form.order_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 200px"
>
<el-option
v-for="item in dict.pdm_workorder_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所属工序">
<el-select
v-model="form.workorder_procedure"

7
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -138,7 +138,7 @@
v-permission="['admin','instruction:edit','instruction:del']"
fixed="right"
label="操作"
width="120px"
width="160px"
align="center"
>
<template slot-scope="scope">
@@ -152,6 +152,11 @@
icon="el-icon-success"
@click="doOperate(scope.row, 'a')"
>完成</el-button>
<el-button
type="text"
icon="el-icon-error"
@click="doOperate(scope.row, 'b')"
>取消</el-button>
</template>
</el-table-column>
</el-table>

24
lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue
View File

@@ -95,29 +95,27 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="bill_code" label="单据编号" min-width="150"/>
<el-table-column prop="io_type" label="出入类型" >
<el-table-column prop="bill_code" label="单据编号" min-width="150" />
<el-table-column prop="io_type" label="出入类型">
<template slot-scope="scope">
{{ dict.label.io_type[scope.row.io_type] }}
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip/>
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3"/>
<el-table-column prop="bill_status" label="单据状态" >
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
<el-table-column prop="bill_status" label="单据状态">
<template slot-scope="scope">
{{ dict.label.st_bill_status[scope.row.bill_status] }}
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="起始点位编码" min-width="120"/>
<el-table-column prop="end_point_code" label="终点点位编码" min-width="120"/>
<el-table-column prop="start_point_code" label="起点" min-width="120" />
<el-table-column prop="end_point_code" label="终点" min-width="120" />
<!-- <el-table-column prop="start_region_id" label="起始区域" />-->
<!-- <el-table-column prop="end_region_id" label="终点区域" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人姓名" min-width="100"/>
<el-table-column prop="update_time" label="修改时间" min-width="140"/>
<el-table-column prop="confirm_optname" label="确认人姓名" min-width="100"/>
<el-table-column prop="confirm_time" label="确认时间" min-width="140"/>
<el-table-column prop="update_optname" label="修改人" min-width="100" />
<el-table-column prop="update_time" label="修改时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -135,7 +133,7 @@
<script>
import crudBill from '@/views/wms/st/regionio'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
@@ -174,7 +172,7 @@ export default {
bill_status: [
{ required: true, message: '单据状态不能为空', trigger: 'blur' }
]
} }
}}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据

25
lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
View File

@@ -126,7 +126,19 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<crudOperation :permission="permission" >
<el-button
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-sort"
:disabled="crud.selections.length === 0"
@click="outInventory(crud.selections)"
>
出库
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
@@ -193,9 +205,8 @@
<el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip/>
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip/>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="ivt_qty" label="库存数" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3"/>
<el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip/>
<el-table-column prop="ext_code" label="外部编码" />
<el-table-column prop="point_status_name" label="点位状态" />
<el-table-column prop="vehicle_type" label="托盘类型" min-width="100"/>
<el-table-column prop="remark" label="备注" />
@@ -228,6 +239,7 @@
</template>
<script>
import crudStructivt from '../structivt'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -279,6 +291,13 @@ export default {
},
hand(value) {
this.crud.toQuery()
},
outInventory(values) {
console.log(values)
crudStructivt.outInventory(values).then(res => {
this.crud.notify('出库成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}

50
lms/nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue
View File

@@ -52,7 +52,19 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<crudOperation :permission="permission" >
<el-button
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-position"
:disabled="crud.selections.length === 0"
@click="makeTask(crud.selections)"
>
生成任务
</el-button>
</crudOperation>
<!--表单组件-->
<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="mini" label-width="80px">
@@ -95,29 +107,27 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="bill_code" label="单据编号" min-width="150"/>
<el-table-column prop="io_type" label="出入类型" >
<el-table-column prop="bill_code" label="单据编号" min-width="150" />
<el-table-column prop="io_type" label="出入类型">
<template slot-scope="scope">
{{ dict.label.io_type[scope.row.io_type] }}
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip/>
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3"/>
<el-table-column prop="bill_status" label="单据状态" >
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
<el-table-column prop="bill_status" label="单据状态">
<template slot-scope="scope">
{{ dict.label.st_bill_status[scope.row.bill_status] }}
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="起始点位编码" min-width="120"/>
<el-table-column prop="end_point_code" label="终点点位编码" min-width="120"/>
<el-table-column prop="start_point_code" label="起点" min-width="120" />
<el-table-column prop="end_point_code" label="终点" min-width="120" />
<!-- <el-table-column prop="start_region_id" label="起始区域" />-->
<!-- <el-table-column prop="end_region_id" label="终点区域" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人姓名" min-width="100"/>
<el-table-column prop="update_time" label="修改时间" min-width="140"/>
<el-table-column prop="confirm_optname" label="确认人姓名" min-width="100"/>
<el-table-column prop="confirm_time" label="确认时间" min-width="140"/>
<el-table-column prop="update_optname" label="修改人" min-width="100" />
<el-table-column prop="update_time" label="修改时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -135,7 +145,7 @@
<script>
import crudBill from '@/views/wms/st/regionio'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
@@ -153,6 +163,10 @@ export default {
url: 'api/regionio',
idField: 'qty_unit_id',
sort: 'qty_unit_id,desc',
query: {
io_type: '2',
io_region: "'CPQYA01'"
},
crudMethod: { ...crudBill }
})
},
@@ -170,14 +184,18 @@ export default {
bill_status: [
{ required: true, message: '单据状态不能为空', trigger: 'blur' }
]
} }
}}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
this.query.io_type = '2'
this.query.io_region = "'CPQYA01'"
return true
},
makeTask(values) {
crudBill.makeTask(values).then(res => {
this.crud.notify('生成任务成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}

10
lms/nladmin-ui/src/views/wms/st/regionio.js
View File

@@ -24,4 +24,12 @@ export function edit(data) {
})
}
export default { add, edit, del }
export function makeTask(data) {
return request({
url: 'api/regionio/makeTask',
method: 'post',
data: data
})
}
export default { add, edit, del, makeTask }

10
lms/nladmin-ui/src/views/wms/st/structivt.js
View File

@@ -24,4 +24,12 @@ export function edit(data) {
})
}
export default { add, edit, del }
export function outInventory(data) {
return request({
url: 'api/structivt/outInventory',
method: 'post',
data: data
})
}
export default { add, edit, del, outInventory }

8
lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue
View File

@@ -109,15 +109,13 @@
{{ dict.label.st_bill_status[scope.row.bill_status] }}
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="起始点位编码" min-width="120" />
<el-table-column prop="end_point_code" label="终点点位编码" min-width="120" />
<el-table-column prop="start_point_code" label="起点" min-width="120" />
<el-table-column prop="end_point_code" label="终点" min-width="120" />
<!-- <el-table-column prop="start_region_id" label="起始区域" />-->
<!-- <el-table-column prop="end_region_id" label="终点区域" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人姓名" min-width="100" />
<el-table-column prop="update_optname" label="修改人" min-width="100" />
<el-table-column prop="update_time" label="修改时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人姓名" min-width="100" />
<el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation