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

rev:流程任务生成

Browse Source
This commit is contained in:
zhangzq
2024-05-23 16:06:25 +08:00
parent b3fee56bb9
commit 8f56f4e988
87 changed files with 1018 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue
View File

@@ -111,7 +111,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="业务表时间映射" prop="bus_data">
<el-input v-model="form.bus_data" style="width: 150px;"/>
<el-input v-model="form.biz_date" style="width: 150px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -120,6 +120,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="业务表单据类型映射" prop="bus_data">
<el-input v-model="form.biz_form_type" style="width: 150px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="物料id映射" prop="material_id">
@@ -173,6 +180,7 @@
<!-- <el-table-column prop="parent_id" show-overflow-tooltip width="120" label="父表id"/>-->
<el-table-column prop="biz_id" show-overflow-tooltip width="120" label="业务单据id映射"/>
<el-table-column prop="biz_code" show-overflow-tooltip width="130" label="业务单据code映射"/>
<el-table-column prop="biz_form_type" show-overflow-tooltip width="130" label="业务单据type映射"/>
<el-table-column prop="biz_date" show-overflow-tooltip width="130" label="业务单据时间映射"/>
<el-table-column prop="biz_status" show-overflow-tooltip width="130" label="业务单据状态映射"/>
<el-table-column prop="material_id" show-overflow-tooltip width="120" label="物料id映射"/>
@@ -227,6 +235,7 @@ const defaultForm = {
biz_code: null,
biz_date: null,
biz_status: null,
biz_form_type: null,
material_id: null,
qty: null,
pcsn: null,

1
wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue
View File

@@ -155,6 +155,7 @@
<el-table-column prop="parent_id" label="父表id" min-width="150"/>
<el-table-column prop="biz_id" label="业务单据id映射" min-width="150"/>
<el-table-column prop="biz_code" label="业务单据code映射" min-width="150"/>
<el-table-column prop="biz_form_type" label="业务单据type映射" min-width="150"/>
<el-table-column prop="biz_date" label="业务单据时间映射" min-width="150"/>
<el-table-column prop="status" label="业务单据状态映射" min-width="150"/>
<el-table-column prop="material_id" label="物料id映射" min-width="150"/>

7
wms_pro/qd/src/views/wms/early_manage/early_data/index.vue
View File

@@ -102,6 +102,11 @@
<el-input v-model="form.biz_code" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务表单据类型映射" prop="class_desc">
<el-input v-model="form.biz_form_type" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务表时间映射" prop="class_desc">
<el-input v-model="form.bus_data" style="width: 120px;" />
@@ -160,6 +165,7 @@
<el-table-column prop="parent_id" label="父表id" min-width="150"/>
<el-table-column prop="biz_id" label="业务单据id映射" />
<el-table-column prop="biz_code" label="业务单据code映射" />
<el-table-column prop="biz_form_type" label="业务单据type映射" />
<el-table-column prop="biz_date" label="业务单据时间映射" />
<el-table-column prop="status" label="业务单据状态映射" />
<el-table-column prop="material_id" label="物料id映射" min-width="120"/>
@@ -211,6 +217,7 @@ const defaultForm = {
create_id: null,
biz_id: null,
biz_code: null,
biz_form_type: null,
biz_date: null,
biz_status: null,
material_id: null,

1
wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
View File

@@ -224,6 +224,7 @@ export default {
curdExecution.flowConfirm(proc_inst_id).then(res => {
crud.notify("操作成功", CRUD.NOTIFICATION_TYPE.SUCCESS)
})
this.crud.toQuery()
},
load(tree, treeNode, resolve) {
setTimeout(() => {

12
wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue
View File

@@ -257,6 +257,7 @@ export default {
},
[CRUD.HOOK.beforeSubmit]() {
debugger
// 提交前校验
if (this.tableData.length === 0) {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
@@ -280,10 +281,8 @@ export default {
})
this.tableData.splice(-1, 0, data)
})
this.form.child_qty = this.tableData.length
},
tableDtlMaterial2(data) {
debugger
let mst = data['t'];
let rows = data['item'];
this.form.source_form_type = mst.form_type
@@ -295,14 +294,6 @@ export default {
if (a.value in mst_form_data) {
item = mst_form_data[a.value];
}
// let keys = Object.keys(mst_form_data);
// for (let i = 0; i < keys.length; i++) {
// let key = keys[i];
// if (a.value == key) {
// item = mst_form_data[a.value];
// break
// }
// }
this.$set(this.form.form_data,a.value,item)
})
rows.forEach((row) => {
@@ -325,7 +316,6 @@ export default {
})
this.tableData.splice(-1, 0, data)
})
this.form.child_qty = this.tableData.length
},
insertEvent(row) {
this.materShow = true

2
wms_pro/qd/src/views/wms/md_manage/group_dick/ViewDialog.vue
View File

@@ -76,7 +76,7 @@
<el-table-column prop="unit_id" label="单位" align="center" />
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" align="center" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单号" align="center" />
<el-table-column v-for="(item, index) in dtlCols" :key="item.value" :label="item.lable" >
<el-table-column show-overflow-tooltip width="150" v-for="(item, index) in dtlCols" :key="item.value" :label="item.lable" >
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="has_child" label="含子托盘" align="center" />

1
wms_pro/qd/src/views/wms/md_manage/group_dick/group_config/index.vue
View File

@@ -27,6 +27,7 @@
<el-table-column prop="parent_id" label="父表id" />
<el-table-column prop="biz_id" label="业务单据id映射" />
<el-table-column prop="biz_code" label="业务单据code映射" />
<el-table-column prop="biz_form_type" label="业务单据类型映射" />
<el-table-column prop="biz_date" label="业务单据时间映射" />
<el-table-column prop="status" label="业务单据状态映射" />
<el-table-column prop="material_id" label="物料id映射" />

66
wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue
View File

@@ -11,7 +11,7 @@
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
<el-input v-model="form.code" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="仓 库">
<el-select
@@ -42,57 +42,52 @@
:disabled="true"
placeholder="业务类型"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_CP_IN_TYPE"
v-for="item in dict.IOBILL_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-form-item label="单据状态" prop="status">
<el-select
v-model="form.bill_status"
v-model="form.status"
clearable
style="width: 210px"
placeholder="单据状态"
class="filter-item"
disabled
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
v-for="item in dict.FORM_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="总数量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
<el-input-number
v-model="form.total_qty"
:controls="false"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
<el-form-item label="源单类型" prop="source_form_type">
<el-input v-model="form.source_form_type" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
<el-form-item label="源单编号" prop="source_form_id">
<el-input v-model="form.source_form_id" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true" />
<el-form-item label="源单日期" prop="source_form_date">
<el-input v-model="form.source_form_date" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="单据日期" prop="bill_code">
<el-input v-model="form.create_time" disabled style="width: 210px" />
</el-form-item>
<template v-for="(col,index) in cols">
<el-form-item label="col.lable" prop="bill_code">
<label slot="label">{{col.lable}}:</label>
<el-input v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 210px" />
<el-input v-model="form.form_data[col.value]" :value="col.value" disabled style="width: 210px" />
</el-form-item>
</template>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true" />
</el-form-item>
</el-form>
<div class="crud-opts2">
<span class="role-span2">入库明细</span>
@@ -115,12 +110,17 @@
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column prop="pcsn" label="批次" width="150" align="center" />
<el-table-column prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="计划数量" align="center" />
<el-table-column prop="qty" :formatter="crud.formatNum3" width="150" label="载具物料数量" align="center" />
<el-table-column prop="unit_id" label="单位" align="center" />
<el-table-column prop="vehicle_code" label="载具" align="center" />
<el-table-column show-overflow-tooltip prop="base_bill_type" label="源单类型" :formatter="formatBaseType" align="center" />
<el-table-column show-overflow-tooltip prop="base_bill_code" label="源单号" align="center" />
<el-table-column show-overflow-tooltip prop="base_bill_table" label="源单行号" align="center" />
<el-table-column prop="stor_code" label="仓库编号" align="center" />
<el-table-column prop="struct_code" label="分配仓位" align="center" />
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" align="center" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单号" align="center" />
<el-table-column show-overflow-tooltip width="150" v-for="(item, index) in dtlCols" :key="item.value" :label="item.lable" >
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
</el-table>
</el-card>
@@ -166,7 +166,7 @@ export default {
name: 'ViewDialog',
components: { formstruc },
mixins: [crud()],
dicts: ['ST_INV_CP_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status', 'SCH_TASK_TYPE_DTL', 'PCS_SAL_TYPE'],
dicts: [ 'FORM_STATUS','IOBILL_TYPE' ],
props: {
dialogShow: {
type: Boolean,
@@ -179,6 +179,7 @@ export default {
data() {
return {
cols:[],
dtlCols:[],
dialogVisible: false,
tableDtl: [],
tabledis: [],
@@ -203,9 +204,12 @@ export default {
},
methods: {
open() {
formstruc.getHeader('STOR_IN').then(res => {
formstruc.getHeader('st_ivt_iostorinv_in').then(res => {
this.cols = res
})
formstruc.getHeader('st_ivt_iostorinvdtl_in').then(res => {
this.dtlCols = res
})
},
setForm(row) {
this.dialogVisible = true
@@ -216,7 +220,7 @@ export default {
this.dialogVisible = false
},
stateFormat(row, column) {
return this.dict.label.IO_BILL_STATUS[row.bill_status]
return this.dict.label.FORM_STATUS[row.bill_status]
},
taskdtl_typeFormat(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]

97
wms_pro/qd/src/views/wms/stor_manage/in/index.vue
View File

@@ -11,6 +11,15 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="单号">
<el-input
v-model="query.code"
size="mini"
clearable
placeholder="单据号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="单据类型">
<el-select
v-model="query.bill_type"
@@ -22,7 +31,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_CP_IN_TYPE"
v-for="item in dict.IOBILL_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -63,7 +72,7 @@
<el-form-item label="单据状态">
<el-select
v-model="query.bill_status"
v-model="query.status"
clearable
size="mini"
placeholder="单据状态"
@@ -71,7 +80,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
v-for="item in dict.FORM_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -79,33 +88,23 @@
</el-select>
</el-form-item>
<el-form-item label="入库单号">
<el-input
v-model="query.bill_code"
size="mini"
clearable
placeholder="单据号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="生产车间">
<el-select
v-model="query.product_area"
clearable
size="mini"
placeholder="全部"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="生产车间">-->
<!-- <el-select-->
<!-- v-model="query.product_area"-->
<!-- clearable-->
<!-- size="mini"-->
<!-- placeholder="全部"-->
<!-- class="filter-item"-->
<!-- @change="crud.toQuery"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in dict.product_area"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<rrOperation />
</el-form>
@@ -143,18 +142,26 @@
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="status" label="单据状态" />
<el-table-column prop="product_area" label="生产车间" width="130" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="form_type" min-width="120" label="单据类型" />
<el-table-column show-overflow-tooltip prop="biz_code" label="仓库" min-width="120" />
<el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
<el-table-column v-for="(item, index) in cols" :key="item.value" :label="item.lable" >
<el-table-column prop="bill_type" label="业务类型">
<template slot-scope="scope">
{{ dict.label.IOBILL_TYPE[scope.row.bill_type] }}
</template>
</el-table-column>
<el-table-column prop="status" label="状态">
<template slot-scope="scope">
{{ dict.label.FORM_STATUS[scope.row.status] }}
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="source_form_type" min-width="120" label="源单类型" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单编码" min-width="120" />
<el-table-column show-overflow-tooltip prop="source_form_date" label="源单时间" min-width="120" />
<el-table-column show-overflow-tooltip width="150" v-for="(item, index) in cols" :key="item.value" :label="item.lable" >
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建人" align="center" prop="create_id" />
<el-table-column label="创建人" align="center" prop="create_name" />
<el-table-column label="创建时间" align="center" prop="create_time" width="150" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column v-permission="[]" label="操作" width="380px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -162,10 +169,10 @@
:disabled-edit="canUd(scope.row)"
:disabled-dle="canUd(scope.row)"
/>
<el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="groupOpen(scope.row)">组盘</el-button>
<el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="groupOpen(scope.row)">分配</el-button>
<el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="groupOpen(scope.row)">任务</el-button>
</template>
<!-- <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="groupOpen(scope.row)">组盘</el-button>-->
<!-- <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="groupOpen(scope.row)">分配</el-button>-->
<!-- <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="groupOpen(scope.row)">任务</el-button>-->
</template>-->
</el-table-column>
</el-table>
<!--分页组件-->
@@ -208,7 +215,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'ST_INV_CP_IN_TYPE', 'product_area'],
dicts: [ 'FORM_STATUS','IOBILL_TYPE' ],
data() {
return {
cols:[],
@@ -247,7 +254,7 @@ export default {
},
methods: {
[CRUD.HOOK.beforeRefresh]() {
formstruc.getHeader('STOR_IN').then(res => {
formstruc.getHeader('st_ivt_iostorinv_in').then(res => {
this.cols = res
})
},