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:
gengby
2024-05-13 18:07:55 +08:00
parent 86c05ad7a8
commit 4b54222103
17 changed files with 363 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@
</el-option>
</el-select>
</el-form-item>
<rrOperation :crud="crud" />
<rrOperation :crud="crud"/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -42,96 +42,105 @@
:title="crud.status.title"
width="600px"
>
<el-form ref="form" :model="form" size="mini" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
<el-row>
<el-col :span="8">
<el-form-item label="表单类型" prop="class_code">
<el-input v-model="form.form_type" style="width: 120px;" />
<el-col :span="12">
<el-form-item label="表单类型" prop="form_type">
<el-input v-model="form.form_type" style="width: 150px;"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="表单名称" prop="class_name">
<el-input v-model="form.form_name" style="width: 120px;" />
<el-col :span="12">
<el-form-item label="表单名称" prop="form_name">
<el-input v-model="form.form_name" style="width: 150px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col >
<el-form-item label="表单描述" prop="class_name">
<el-input v-model="form.form_desc" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col >
<el-form-item label="表单对应json" prop="class_name">
<el-input v-model="form.convert_json" style="width: 370px;" />
<el-col :span="24">
<el-form-item label="表单描述" prop="form_desc">
<el-input type="textarea" v-model="form.form_desc" style="width: 430px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col >
<el-form-item label="是否含有子表" prop="class_name">
<el-col :span="24">
<el-form-item label="表单对应JSON" prop="convert_json">
<el-input type="textarea" v-model="form.convert_json" style="width: 430px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="父表类型" prop="class_name">
<el-select
v-model="form.parent_id"
placeholder="父表类型"
clearable
style="width: 150px"
>
<el-option
v-for="item in form_types"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否含有子表" prop="has_child">
<el-radio-group v-model="form.has_child" style="width: 140px">
<el-radio label=true>是</el-radio>
<el-radio label=false>否</el-radio>
<el-radio :label='true'>是</el-radio>
<el-radio :label='false'>否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col>
<el-select
v-model="form.parent_id"
placeholder="父表类型"
clearable
>
<el-option
v-for="item in form_types"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="业务表id映射" prop="class_desc">
<el-input v-model="form.bus_id" style="width: 120px;" />
<el-col :span="12">
<el-form-item label="业务表id映射" prop="bus_id">
<el-input v-model="form.bus_id" style="width: 150px;"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务表编码映射" prop="class_desc">
<el-input v-model="form.bus_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.bus_data" style="width: 120px;" />
<el-col :span="12">
<el-form-item label="业务表编码映射" prop="bus_code">
<el-input v-model="form.bus_code" style="width: 150px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="业务表状态映射" prop="class_desc">
<el-input v-model="form.bus_status" style="width: 120px;" />
<el-col :span="12">
<el-form-item label="业务表时间映射" prop="bus_data">
<el-input v-model="form.bus_data" style="width: 150px;"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料id映射" prop="class_desc">
<el-input v-model="form.material_id" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料数量映射" prop="class_desc">
<el-input v-model="form.qty" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料批次映射" prop="class_desc">
<el-input v-model="form.pcsn" style="width: 120px;" />
<el-col :span="12">
<el-form-item label="业务表状态映射" prop="bus_status">
<el-input v-model="form.bus_status" style="width: 150px;"/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="自定义字段2" prop="class_desc">
<el-input type="textarea" v-model="form.form_param" :formatter="jsonFormat" style="width: 370px;" />
<el-row>
<el-col :span="12">
<el-form-item label="物料id映射" prop="material_id">
<el-input v-model="form.material_id" style="width: 150px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料数量映射" prop="qty">
<el-input v-model="form.qty" style="width: 150px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="物料批次映射" prop="pcsn">
<el-input v-model="form.pcsn" style="width: 150px;"/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="自定义字段2" prop="form_param">
<el-input type="textarea" v-model="form.form_param" :formatter="jsonFormat" style="width: 430px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -143,33 +152,33 @@
<el-table
ref="table"
v-loading="crud.loading"
:load="load"
lazy
:load="getClassDatas"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:data="crud.data"
row-key="id"
@select="crud.selectChange"
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
row-key="form_type"
table-layout="auto"
>
<el-table-column prop="form_type" label="表单类型" />
<el-table-column prop="form_name" label="表单名称" />
<el-table-column prop="form_desc" label="描述" />
<el-table-column prop="convert_json" label="表单对应json" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="has_child" :formatter="booleanFormat" label="是否关联子表" />
<el-table-column prop="parent_id" label="父表id" />
<el-table-column prop="bus_id" label="业务单据id映射" />
<el-table-column prop="bus_code" label="业务单据code映射" />
<el-table-column prop="bus_date" label="业务单据时间映射" />
<el-table-column prop="status" label="业务单据状态映射" />
<el-table-column prop="material_id" label="物料id映射" />
<el-table-column prop="qty" label="物料数量映射" />
<el-table-column prop="pcsn" label="物料批次映射" />
<el-table-column prop="form_param" :show-overflow-tooltip="true" :formatter="jsonFormat" label="自定义字段映射" />
<el-table-column type="selection"/>
<el-table-column prop="form_type" show-overflow-tooltip width="150" label="表单类型"/>
<el-table-column prop="form_name" show-overflow-tooltip width="120" label="表单名称"/>
<el-table-column prop="form_desc" show-overflow-tooltip width="120" label="描述"/>
<el-table-column prop="convert_json" show-overflow-tooltip width="120" label="表单对应JSON"/>
<el-table-column prop="has_child" show-overflow-tooltip width="120" :formatter="booleanFormat" label="是否关联子表"/>
<!-- <el-table-column prop="parent_id" show-overflow-tooltip width="120" label="父表id"/>-->
<el-table-column prop="bus_id" show-overflow-tooltip width="120" label="业务单据id映射"/>
<el-table-column prop="bus_code" show-overflow-tooltip width="130" label="业务单据code映射"/>
<el-table-column prop="bus_date" show-overflow-tooltip width="130" label="业务单据时间映射"/>
<el-table-column prop="status" show-overflow-tooltip width="130" label="业务单据状态映射"/>
<el-table-column prop="material_id" show-overflow-tooltip width="120" label="物料id映射"/>
<el-table-column prop="qty" show-overflow-tooltip width="120" label="物料数量映射"/>
<el-table-column prop="pcsn" show-overflow-tooltip width="120" label="物料批次映射"/>
<el-table-column prop="form_param" show-overflow-tooltip width="120" :formatter="jsonFormat" label="自定义字段映射"/>
<el-table-column prop="create_time" show-overflow-tooltip width="150" label="创建时间"/>
<el-table-column
label="操作"
width="250px"
width="280px"
fixed="right"
align="center"
>
<template slot-scope="scope">
@@ -181,13 +190,11 @@
:disabled-dle="scope.row.is_modify === '0'"
msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
/>
<el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="crud.toAddAndData(addSibling(scope.row))">新增同级</el-button>
<el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus" @click="crud.toAddAndData(addChildren(scope.row))">新增子级</el-button>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()"/>
</div>
@@ -195,8 +202,8 @@
<script>
import formstruc from './formstruc'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
@@ -219,12 +226,14 @@ const defaultForm = {
pcsn: null,
form_param: null,
has_child: false,
parent_id: null
parent_id: null,
convert_json: null,
bus_data: null
}
export default {
name: 'FormStruc',
dicts: ['base_data'],
components: {UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect },
components: {UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect},
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -232,7 +241,7 @@ export default {
url: 'api/bmFormStruc',
idField: 'id',
sort: 'id,desc',
crudMethod: { ...formstruc },
crudMethod: {...formstruc},
optShow: {
add: true,
reset: true
@@ -244,18 +253,35 @@ export default {
classes: [],
uploadShow: false,
form_types: [],
permission: {}
permission: {},
rules: {
form_type: [
{required: true, message: '表单类型不能为空', trigger: 'blur'}
],
form_name: [
{required: true, message: '表单名称不能为空', trigger: 'blur'}
]
}
}
},
created() {
this.getFormSelect() // 获取分类
},
methods: {
[CRUD.HOOK.beforeToEdit]() {
this.form.form_param = JSON.stringify(this.form.form_param)
return true
},
getFormSelect() {
formstruc.getTypes().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
this.form_types = res
})
},
load(tree, treeNode, resolve) {
setTimeout(() => {
resolve(tree.children)
}, 100)
},
booleanFormat(row, index) {
if (row.has_child) {
return '是'

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

@@ -20,29 +20,29 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
width="550px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="150px">
<el-form-item label="父流程id" prop="parent_id">
<el-input v-model="form.parent_id" style="width: 370px;"/>
<el-input v-model="form.parent_id" style="width: 300px;"/>
</el-form-item>
<el-form-item label="当前实例对应版本" prop="deployment_id">
<el-input v-model="form.deployment_id" style="width: 370px;"/>
<el-input v-model="form.deployment_id" style="width: 300px;"/>
</el-form-item>
<el-form-item label="当前实例执行节点" prop="activity_id">
<el-input v-model="form.activity_id" style="width: 370px;"/>
<el-input v-model="form.activity_id" style="width: 300px;"/>
</el-form-item>
<el-form-item label="实例状态" prop="status">
<el-input v-model="form.status" style="width: 370px;"/>
<el-input v-model="form.status" style="width: 300px;"/>
</el-form-item>
<el-form-item label="业务类型" prop="form_type">
<el-input v-model="form.form_type" style="width: 370px;"/>
<el-input v-model="form.form_type" style="width: 300px;"/>
</el-form-item>
<el-form-item label="业务数据" prop="form_data">
<el-input v-model="form.form_data" style="width: 370px;"/>
<el-input type="textarea" v-model="form.form_data" style="width: 300px;"/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" style="width: 370px;"/>
<el-input type="textarea" v-model="form.remark" style="width: 300px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -112,10 +112,11 @@
align="center"
>
<template slot-scope="scope">
<el-button @click="viewClick(scope.row)" type="text" icon="el-icon-thumb" size="small">预览</el-button>
<el-button slot="right" @click="viewClick(scope.row)" type="text" icon="el-icon-thumb" size="mini">预览</el-button>
<udOperation
:data="scope.row"
:permission="permission"
style="display: inline"
/>
</template>
</el-table-column>
@@ -199,6 +200,10 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
return true
},
[CRUD.HOOK.beforeToEdit]() {
this.form.form_data = JSON.stringify(this.form.form_data)
return true
},
viewClick(row) {
curdExecution.getDeploymentById(row.deployment_id).then(res => {
this.$refs.viewCurrentFlowDesigner.showLogicFlowDesigner(res.model_editor_json, row);

2
wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerEnd.js
View File

@@ -53,7 +53,7 @@ class ResizableEllipseView extends EllipseResize.view {
rx,
ry,
fill: 'none',
stroke: 'black',
// stroke: 'black',
}),
this.getIconShape()
]

2
wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerGatewayTask.js
View File

@@ -45,7 +45,7 @@ class ResizableDiamondView extends DiamondResize.view {
y: y - height / 2,
points: pointsPath,
fill: 'none',
stroke: 'black', // 边框颜色
// stroke: 'black', // 边框颜色
strokeWidth: 1, // 边框宽度
strokeOpacity: 1, // 边框透明度
fillOpacity: 0.5, // 填充透明度

2
wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerStart.js
View File

@@ -50,7 +50,7 @@ class ResizableEllipseView extends EllipseResize.view {
rx,
ry,
fill: 'none',
stroke: 'black',
// stroke: 'black',
}),
this.getIconShape()
]

121
wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue
View File

@@ -14,22 +14,38 @@
<el-form-item label="单据类型">
<el-select
v-model="query.form_type"
placeholder="请选择单据类型"
clearable
filterable
size="mini"
placeholder="请选择/搜索"
class="filter-item"
style="width: 185px;"
@change="crud.toQuery()"
>
<el-option
v-for="item in fromTypes"
:key="item.value"
:value="item.value"
:label="item.label"
:value="item.value">
</el-option>
/>
</el-select>
<!-- <el-select-->
<!-- v-model="query.form_type"-->
<!-- placeholder="请选择单据类型"-->
<!-- clearable-->
<!-- filterable-->
<!-- size="mini"-->
<!-- class="filter-item"-->
<!-- style="width: 185px;"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in fromTypes"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item>
<rrOperation :crud="crud" />
<rrOperation :crud="crud"/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -65,19 +81,18 @@
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="code" label="单据编码" />
<el-table-column prop="form_type" label="单据类型" />
<el-table-column prop="biz_code" label="业务单据编码" />
<el-table-column prop="biz_date" label="业务单据时间" />
<el-table-column prop="material_id" label="物料id" />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="qty" label="物料数量" />
<el-table-column prop="vehicle_code" label="载具编号" />
<el-table-column prop="status" label="单据状态" />
<el-table-column prop="proc_inst_id" label="对应流程实例id" />
<el-table-column prop="parent_id" label="父单据数据id" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="code" label="单据编码"/>
<el-table-column prop="form_type" label="单据类型"/>
<el-table-column prop="biz_code" label="业务单据编码"/>
<el-table-column prop="biz_date" label="业务单据时间"/>
<el-table-column prop="material_id" label="物料id"/>
<el-table-column prop="pcsn" label="批次"/>
<el-table-column prop="qty" label="物料数量"/>
<el-table-column prop="vehicle_code" label="载具编号"/>
<el-table-column prop="status" label="单据状态"/>
<el-table-column prop="proc_inst_id" label="对应流程实例id"/>
<el-table-column prop="parent_id" label="父单据数据id"/>
<el-table-column prop="create_time" label="创建时间"/>
<el-table-column
v-permission="['admin','Classstandard:edit','Classstandard:del']"
label="操作"
@@ -97,16 +112,16 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<!-- <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()"/>-->
<!-- <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()"/>-->
</div>
</template>
<script>
import crudFormData from './formData'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
@@ -115,33 +130,27 @@ import pagination from '@crud/Pagination'
// import UploadDialog from './UploadDialog'
let defaultForm = {
class_id: null,
base_data_type: null,
path_code: null,
class_code: null,
long_class_code: null,
class_name: null,
class_desc: null,
parent_class_id: null,
is_leaf: null,
sub_count: null,
is_modify: null,
is_delete: null,
class_level: null,
ext_id: null,
ext_parent_id: null,
create_id: null,
create_name: null,
id: null,
code: null,
proc_inst_id: null,
biz_id: null,
boz_code: null,
biz_date: null,
form_type: null,
status: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
isTop: '1'
create_name: null,
material_id: null,
qty: null,
pcsn: null,
vehicle_code: null,
from_data: null,
parent_id: null
}
export default {
name: 'FormData',
dicts: ['base_data'],
components: {pagination, crudOperation, rrOperation, udOperation, Treeselect },
components: {pagination, crudOperation, rrOperation, udOperation, Treeselect},
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -149,7 +158,7 @@ export default {
url: 'api/pmFormData',
idField: 'id',
sort: 'id,desc',
crudMethod: { ...crudFormData },
crudMethod: {...crudFormData},
optShow: {
add: true,
reset: true
@@ -162,19 +171,31 @@ export default {
uploadShow: false,
fromTypes: [],
permission: {},
rules: {
}
rules: {}
}
},
created() {
this.getFromTypes()
this.crud.query.from_type = this.fromTypes[0].value
// 获取分类
this.getFromTypes()
// this.crud.toQuery()
},
mounted() {
},
methods: {
[CRUD.HOOK.beforeRefresh]() {
if (this.fromTypes.length > 0){
return true
}
return false
},
getFromTypes() {
crudFormData.getFormType().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
this.fromTypes = res
if (this.fromTypes.length > 0) {
this.$set(this.query, 'form_type', this.fromTypes[0].value)
this.crud.toQuery()
}
})
},
}

1
wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue
View File

@@ -168,6 +168,7 @@
<el-table-column prop="mapping_json" :show-overflow-tooltip="true" :formatter="jsonFormat" label="字段映射关系" width="210" />
<el-table-column prop="update_name" label="更新人" width="150" />
<el-table-column prop="update_time" label="更新时间" width="150" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation