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

add:添加子流程功能

Browse Source
This commit is contained in:
zhangzq
2024-05-07 17:18:06 +08:00
parent 5bab3ae808
commit 7fb22d2fbf
113 changed files with 2122 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wms_pro/qd/src/views/wms/base_manage/material/MaterDialog.vue
View File

@@ -138,12 +138,6 @@ export default {
const param = {
'materOpt_code': this.materOptCode
}
crudMaterialbase.getMaterOptType(param).then(res => {
this.class_idStr = res.class_idStr
this.crud.query.class_idStr = res.class_idStr
this.crud.toQuery()
this.queryClassId()
})
},
queryClassId() {
const param = {

2
wms_pro/qd/src/views/wms/base_manage/material/index.vue
View File

@@ -207,7 +207,7 @@ const defaultForm = {
material_spec: null,
material_model: null,
english_name: null,
base_unit_id: null,
qty_unit_id: null,
approve_fileno: null,
print_no: null,
material_type_id: null,

10
wms_pro/qd/src/views/wms/base_manage/strategy/AddDialog.vue → wms_pro/qd/src/views/wms/decision_manage/strategy/AddDialog.vue
View File

@@ -56,8 +56,8 @@
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="描述:" prop="strategy_test">
<el-input v-model="form.strategy_test" :rows="3" type="textarea" style="width: 560px;" />
<el-form-item label="描述:" prop="remark">
<el-input v-model="form.remark" :rows="3" type="textarea" style="width: 560px;" />
</el-form-item>
</el-col>
</el-row>
@@ -79,10 +79,7 @@ const defaultForm = {
param: null,
remark: null,
is_used: null,
create_id: null,
create_name: null,
create_time: null,
update_id: null,
ban: null,
update_name: null,
update_time: null,
is_delete: null
@@ -147,6 +144,7 @@ export default {
})
},
close() {
this.form = []
this.$emit('update:dialogShow', false)
}
}

25
wms_pro/qd/src/views/wms/base_manage/strategy/index.vue → wms_pro/qd/src/views/wms/decision_manage/strategy/index.vue
View File

@@ -38,26 +38,29 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column label="策略类型" >
<template slot-scope="scope">
{{scope.row.ban?"系统策略":"自定义策略"}}
</template>
</el-table-column>
<el-table-column prop="strategy_name" label="策略名称" />
<el-table-column prop="strategy_code" label="策略编码" />
<el-table-column prop="strategy_type" label="策略类型" />
<el-table-column prop="class_type" label="类处理类型" />
<el-table-column prop="param" label="参数" />
<el-table-column prop="remark" label="描述" />
<el-table-column prop="strategy_type" label="决策类型" />
<el-table-column prop="class_type" label="策略执行器" />
<el-table-column prop="param" show-overflow-tooltip label="参数" />
<el-table-column prop="remark" show-overflow-tooltip label="描述" />
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
:value="format_is_used(scope.row.is_used)"
:value="scope.row.is_used"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row, scope.row.is_used)"
/>
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="update_name" label="修改人" />
<el-table-column prop="update_time" label="修改时间" />
<el-table-column prop="update_name" label="操作人" />
<el-table-column prop="update_time" label="操作时间" />
<el-table-column
v-permission="[]"
label="操作"
@@ -67,6 +70,8 @@
>
<template slot-scope="scope">
<udOperation
:disabledDle="scope.row.ban"
:disabledEdit="scope.row.ban"
:data="scope.row"
:permission="permission"
/>
@@ -123,7 +128,7 @@ export default {
return true
},
format_is_used(is_used) {
return is_used === '1'
return is_used==true
},
changeEnabled(data, val) {
let msg = '此操作将停用，是否继续！'

0
wms_pro/qd/src/views/wms/base_manage/strategy/strategy.js → wms_pro/qd/src/views/wms/decision_manage/strategy/strategy.js
View File

304
wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue Normal file
View File

@@ -0,0 +1,304 @@
<template>
<el-dialog
:title="crud.status.title"
append-to-body
fullscreen
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0 || crud.status.view > 0"
width="1200px"
@open="open"
@close="close"
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
</el-col>
<el-col :span="4">
<span>
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
</span>
</el-col>
</el-row>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="主载具编码" prop="parent_vehicle_code">
<label slot="label">主载具编码:</label>
<el-input v-model="form.parent_vehicle_code" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-select
v-model="form.bill_status"
clearable
style="width: 210px"
placeholder="单据状态"
class="filter-item"
disabled
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="子托盘总数" prop="child_qty">
<label slot="label">子托盘总数:</label>
<el-input-number
v-model="form.child_qty"
:controls="false"
:precision="0"
:min="0"
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-form-item>
</template>
<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="crud.status.view > 0" />
</el-form-item>
</el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertEvent()"
>
添加物料
</el-button>
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertdtl()"
>
新增一行
</el-button>
</span>
</div>
<!--表格渲染-->
<el-table
ref="table"
:data="tableData"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编号" width="120" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].vehicle_code" class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="has_child" label="是否含有子载具" width="120" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].has_child" class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="parent_vehicle_code" label="父载具编码" width="120" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].parent_vehicle_code" class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" width="120" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].material_name" disabled class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" width="120" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].material_spec" disabled class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="pcsn" label="物料批次" width="120" align="center">
<template scope="scope"><el-input v-model="tableData[scope.$index].pcsn" class="input-with-select" /></template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="qty" label="数量" width="120" align="center">
<template scope="scope"><el-input v-model="tableData[scope.$index].qty" class="input-with-select" /></template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" width="120" align="center">
<template scope="scope"><el-input v-model="tableData[scope.$index].qty_unit_name" class="input-with-select" /></template>
</el-table-column>
<el-table-column v-for="(item, index) in dtlCols" :key="item.value" :label="item.lable" >
<template scope="scope">
<el-input v-model="tableData[scope.$index].form_data[item.value]" class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="remark" label="备注" width="120" align="center">
<template scope="scope"><el-input v-model="tableData[scope.$index].remark" class="input-with-select" /></template>
</el-table-column>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
<template scope="scope">
<el-button
type="danger"
class="filter-item"
size="mini"
icon="el-icon-delete"
@click.native.prevent="deleteRow(scope.$index, tableData)"
/>
</template>
</el-table-column>
</el-table>
<MaterDialog
:dialog-show.sync="materShow"
:is-single="false"
:mater-opt-code="materType"
@setMaterValue="tableDtlMaterial"
/>
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import MaterDialog from '@/views/wms/base_manage/material/MaterDialog'
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
const defaultForm = {
id: '',
parent_vehicle_code: '',
child_qty: '0',
remark: '',
update_name: '',
update_time: '',
status: '',
tableData: [],
form_data: {}
}
export default {
name: 'AddDialog',
components: { formstruc, MaterDialog },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_INV_CP_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area', 'PCS_SAL_TYPE'],
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: Object
}
},
data() {
return {
cols:[],
dtlCols:[],
tableData:[],
dialogVisible: false,
materShow: false,
dtlShow: false,
opendtlParam: null,
materType: '03', // 关键成品
storlist: [],
billtypelist: [],
rules: {
}
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
open() {
formstruc.getHeader('GROUP_MST').then(res => {
this.cols = res
res.forEach(a => {
this.form.form_data[a.value,'']
})
}),
formstruc.getHeader('GROUP_DICK').then(res => {
this.dtlCols = res
})
},
close() {
this.$emit('AddChanged')
},
[CRUD.HOOK.beforeSubmit]() {
// 提交前校验
if (this.tableData.length === 0) {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return true
}
this.form.tableData = this.tableData
},
deleteRow(index, rows) {
rows.splice(index, 1)
},
tableDtlMaterial(rows) {
rows.forEach((row) => {
const data = {}
data.material_name = row.material_name
data.material_code = row.material_code
data.material_id = row.material_id
data.material_spec = row.material_spec
data.form_data = {}
this.dtlCols.forEach(a=>{
this.$set(data.form_data,a.value,null)
})
this.tableData.splice(-1, 0, data)
})
this.form.child_qty = this.tableData.length
},
insertEvent(row) {
this.materShow = true
},
queryMater(index, row) {
this.nowindex = index
this.nowrow = row
this.materShow = true
},
insertdtl() {
if (this.form.bill_type === '') {
this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.tableData.push({ edit: false, qty: '0' })
},
formatBaseType(row) {
return this.dict.label.PCS_SAL_TYPE[row.base_bill_type]
}
}
}
</script>
<style>
.crud-opts2 {
padding: 4px 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .crud-opts-right2 {
margin-left: auto;
}
</style>

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

@@ -62,72 +62,7 @@
导入
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
title="新增组盘信息">
<el-form
ref="form"
:inline="true"
:model="form"
label-width="160px"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
>
<el-form-item label="托盘号" prop="vehicle_code">
</el-form-item>
<el-form-item label="物料规格" prop="material_spec">
</el-form-item>
<el-form-item label="数量" prop="qty">
</el-form-item>
<el-form-item label="计量单位" prop="qty_unit_name">
</el-form-item>
<el-form-item label="组盘时间" prop="create_time">
<el-input v-model="form.create_time" style="width: 200px;" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="" style="width: 200px">
<el-option
v-for="item in dict.BOX_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px"></el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<el-dialog width ="250" :close-on-click-modal="false" :visible.sync="statusEdit" title="编辑托盘状态">
<el-form
ref="form"
:inline="true"
:model="editForm"
label-width="100px"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
>
<el-form-item label="托盘号" prop="deliver_code">
<el-input v-model="editForm.storagevehicle_code" style="width: 160px;" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="editForm.status" placeholder="" style="width: 120px">
<el-option
v-for="item in dict.BOX_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitStatus">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
@selection-change="crud.selectionChangeHandler">
@@ -160,12 +95,7 @@
<!--分页组件-->
<pagination/>
</div>
<UploadDialog
:dialog-show.sync="uploadShow"
@tableChanged3="tableChanged3"
/>
<vechileViewDialog ref="vechileViewDialog" :dialog-show.sync="vachileView" />
<Dialog :dialog-show.sync="dialogShow" />
<AddDialog @AddChanged="querytable" />
</div>
</template>
@@ -175,41 +105,27 @@ import CRUD, {presenter, header, form, crud} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import UploadDialog from '@/views/wms/md_manage/group_dick/UploadDialog'
import Dialog from '@/views/wms/md_manage/group_dick/Dialog'
import vechileViewDialog from '@/views/wms/md_manage/group_dick/vechileViewDialog'
import pagination from '@crud/Pagination'
import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
import AddDialog from '@/views/wms/md_manage/group_dick/AddDialog'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
const defaultForm = {
deliver_id: null,
deliver_code: null,
seq_no: null,
deliver_type: null,
material_id: null,
status: null,
delivery_qty: null,
cust_id: null,
qty_unit_id: null,
sale_id: null,
sale_code: null,
sale_seq_no: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
cust_code: null,
cust_name: null
id: '',
parent_vehicle_code: '',
child_qty: '0',
remark: '0',
update_name: '',
update_time: '',
status: '',
tableData: [],
form_data: {}
}
export default {
name: 'DeliveryOrder',
dicts: ['PCS_DELIVER_TYPE', 'BOX_STATUS'],
components: {formstruc, vechileViewDialog,pagination, crudOperation, rrOperation, udOperation, Treeselect, Dialog, UploadDialog},
components: {AddDialog, formstruc,pagination, crudOperation, rrOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -247,6 +163,9 @@ export default {
formstruc.getHeader('GROUP_DICK').then(res => {
this.cols = res
})
},
querytable(){
this.crud.toQuery()
}
}
}

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

@@ -115,8 +115,9 @@
<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="plan_qty" :formatter="crud.formatNum3" label="数量" 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="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" />