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

代码更新

Browse Source
This commit is contained in:
ldj_willow
2022-10-31 14:24:33 +08:00
parent e528ceecdf
commit ae3be47bb7
2 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
wms/qd/src/views/wms/st/core/dumpinv/index.vue
View File

@@ -29,7 +29,7 @@
:value="item.code" :value="item.code"
/> />
</el-select> </el-select>
<rrOperation/> <rrOperation />
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation> <crudOperation>
@@ -84,37 +84,37 @@
> >
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="转储单明细标识" prop="dumpinv_uuid"> <el-form-item label="转储单明细标识" prop="dumpinv_uuid">
<el-input v-model="form.dumpinv_uuid" style="width: 370px;"/> <el-input v-model="form.dumpinv_uuid" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="转出仓位标识" prop="turnout_struct_uuid"> <el-form-item label="转出仓位标识" prop="turnout_struct_uuid">
<el-input v-model="form.turnout_struct_uuid" style="width: 370px;"/> <el-input v-model="form.turnout_struct_uuid" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="重量计量单位标识" prop="weight_unit_uuid"> <el-form-item label="重量计量单位标识" prop="weight_unit_uuid">
<el-input v-model="form.weight_unit_uuid" style="width: 370px;"/> <el-input v-model="form.weight_unit_uuid" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="数量计量单位标识" prop="qty_unit_uuid"> <el-form-item label="数量计量单位标识" prop="qty_unit_uuid">
<el-input v-model="form.qty_unit_uuid" style="width: 370px;"/> <el-input v-model="form.qty_unit_uuid" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="重量" prop="weight"> <el-form-item label="重量" prop="weight">
<el-input v-model="form.weight" style="width: 370px;"/> <el-input v-model="form.weight" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="数量" prop="qty"> <el-form-item label="数量" prop="qty">
<el-input v-model="form.qty" style="width: 370px;"/> <el-input v-model="form.qty" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="转入仓位标识" prop="turnin_struct_uuid"> <el-form-item label="转入仓位标识" prop="turnin_struct_uuid">
<el-input v-model="form.turnin_struct_uuid" style="width: 370px;"/> <el-input v-model="form.turnin_struct_uuid" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="任务标识" prop="task_uuid"> <el-form-item label="任务标识" prop="task_uuid">
<el-input v-model="form.task_uuid" style="width: 370px;"/> <el-input v-model="form.task_uuid" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="载具号" prop="vehicle_code"> <el-form-item label="载具号" prop="vehicle_code">
<el-input v-model="form.vehicle_code" style="width: 370px;"/> <el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;"/> <el-input v-model="form.remark" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="is_active"> <el-form-item label="是否启用" prop="is_active">
<el-input v-model="form.is_active" style="width: 370px;"/> <el-input v-model="form.is_active" style="width: 370px;" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -131,43 +131,43 @@
style="width: 100%;" style="width: 100%;"
@selection-change="crud.selectionChangeHandler" @selection-change="crud.selectionChangeHandler"
> >
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="dumpinv_uuid" label="转储单明细标识"/> <el-table-column v-if="false" prop="dumpinv_uuid" label="转储单明细标识" />
<el-table-column prop="bill_code" label="单据编码" width="130px"/> <el-table-column prop="bill_code" label="单据编码" width="130px" />
<el-table-column v-if="false" prop="bill_status" label="单据状态" /> <el-table-column v-if="false" prop="bill_status" label="单据状态" />
<el-table-column prop="bill_status_name" label="单据状态" :formatter="formatStatusName" min-width="100" show-overflow-tooltip/> <el-table-column prop="bill_status_name" label="单据状态" :formatter="formatStatusName" min-width="100" show-overflow-tooltip />
<!-- <!--
<el-table-column prop="weight" label="重量"/> <el-table-column prop="weight" label="重量"/>
--> -->
<el-table-column prop="qty" label="数量" :formatter="formatQty"/> <el-table-column prop="qty" label="数量" :formatter="formatQty" />
<el-table-column prop="qty_unit_name" label="单位"/> <el-table-column prop="qty_unit_name" label="单位" />
<el-table-column prop="turnout_struct_code" label="转出仓位编码" width="100px"/> <el-table-column prop="turnout_struct_code" label="转出仓位编码" width="100px" />
<el-table-column prop="turnout_struct_name" label="转出仓位名字" width="100px"/> <el-table-column prop="turnout_struct_name" label="转出仓位名字" width="100px" />
<el-table-column prop="turnin_struct_code" label="转入仓位编码" width="100px"/> <el-table-column prop="turnin_struct_code" label="转入仓位编码" width="100px" />
<el-table-column prop="turnin_struct_name" label="转入仓位名字" width="100px"/> <el-table-column prop="turnin_struct_name" label="转入仓位名字" width="100px" />
<!-- <!--
<el-table-column prop="task_uuid" label="任务标识"/> <el-table-column prop="task_uuid" label="任务标识"/>
--> -->
<el-table-column prop="vehicle_code" label="载具号"/> <el-table-column prop="vehicle_code" label="载具号" />
<el-table-column prop="formula" label="配方"/> <el-table-column prop="formula" label="配方" />
<el-table-column prop="pcsn" label="批次"/> <el-table-column prop="pcsn" label="批次" />
<el-table-column prop="material_name" label="物料名称"/> <el-table-column prop="material_name" label="物料名称" />
<el-table-column prop="remark" label="备注"/> <el-table-column prop="remark" label="备注" />
<el-table-column prop="update_by" label="修改者"/> <el-table-column prop="update_by" label="修改者" />
<el-table-column prop="update_time" label="修改时间" width="140"/> <el-table-column prop="update_time" label="修改时间" width="140" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination/> <pagination />
</div> </div>
<AddDialog :dialog-show.sync="addShow" :open-param="openParam"/> <AddDialog :dialog-show.sync="addShow" :open-param="openParam" />
</div> </div>
</template> </template>
<script> <script>
import crudDumpinv from '@/api/wms/st/core/dumpinv' import crudDumpinv from '@/api/wms/st/core/dumpinv'
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 rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
@@ -193,7 +193,7 @@ const defaultForm = {
} }
export default { export default {
name: 'Dumpinv', name: 'Dumpinv',
components: {pagination, crudOperation, rrOperation, AddDialog}, components: { pagination, crudOperation, rrOperation, AddDialog },
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() { cruds() {
return CRUD({ return CRUD({
@@ -201,7 +201,7 @@ export default {
url: 'api/dumpinv', url: 'api/dumpinv',
idField: 'dumpinv_uuid', idField: 'dumpinv_uuid',
sort: 'dumpinv_uuid,desc', sort: 'dumpinv_uuid,desc',
crudMethod: {...crudDumpinv}, crudMethod: { ...crudDumpinv },
optShow: { optShow: {
add: false, add: false,
edit: false, edit: false,
@@ -224,31 +224,31 @@ export default {
}, },
rules: { rules: {
dumpinv_uuid: [ dumpinv_uuid: [
{required: true, message: '转储单明细标识不能为空', trigger: 'blur'} { required: true, message: '转储单明细标识不能为空', trigger: 'blur' }
], ],
turnout_struct_uuid: [ turnout_struct_uuid: [
{required: true, message: '转出仓位标识不能为空', trigger: 'blur'} { required: true, message: '转出仓位标识不能为空', trigger: 'blur' }
], ],
weight_unit_uuid: [ weight_unit_uuid: [
{required: true, message: '重量计量单位标识不能为空', trigger: 'blur'} { required: true, message: '重量计量单位标识不能为空', trigger: 'blur' }
], ],
qty_unit_uuid: [ qty_unit_uuid: [
{required: true, message: '数量计量单位标识不能为空', trigger: 'blur'} { required: true, message: '数量计量单位标识不能为空', trigger: 'blur' }
], ],
weight: [ weight: [
{required: true, message: '重量不能为空', trigger: 'blur'} { required: true, message: '重量不能为空', trigger: 'blur' }
], ],
qty: [ qty: [
{required: true, message: '数量不能为空', trigger: 'blur'} { required: true, message: '数量不能为空', trigger: 'blur' }
], ],
turnin_struct_uuid: [ turnin_struct_uuid: [
{required: true, message: '转入仓位标识不能为空', trigger: 'blur'} { required: true, message: '转入仓位标识不能为空', trigger: 'blur' }
], ],
task_uuid: [ task_uuid: [
{required: true, message: '任务标识不能为空', trigger: 'blur'} { required: true, message: '任务标识不能为空', trigger: 'blur' }
], ],
vehicle_code: [ vehicle_code: [
{required: true, message: '载具号不能为空', trigger: 'blur'} { required: true, message: '载具号不能为空', trigger: 'blur' }
] ]
} }
} }

2
wms/qd/src/views/wms/st/core/inbill/index.vue
View File

@@ -112,7 +112,7 @@
<el-table-column prop="dtl_count" label="明细数" /> <el-table-column prop="dtl_count" label="明细数" />
<el-table-column prop="export_num" label="导出次数" /> <el-table-column prop="export_num" label="导出次数" />
<el-table-column prop="print_num" label="打印次数" /> <el-table-column prop="print_num" label="打印次数" />
<el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip/> <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
<el-table-column prop="update_by" label="修改者" /> <el-table-column prop="update_by" label="修改者" />
<af-table-column label="修改时间"> <af-table-column label="修改时间">
<template slot-scope="scope"> <template slot-scope="scope">