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

opt:优化ERP同步锁，单据推送暂停问题

Browse Source
This commit is contained in:
gongbaoxiong
2025-03-12 13:09:31 +08:00
parent d816474903
commit da8ebb188d
10 changed files with 99 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue
View File

@@ -86,12 +86,12 @@
/>
</el-select>
</el-form-item>
<rrOperation/>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -118,8 +118,8 @@
</el-form-item>
<el-form-item label="所属区域" prop="region_code">
<el-select
disabled
v-model="form.region_code"
disabled
placeholder="请选择"
style="width: 370px;"
>
@@ -131,13 +131,13 @@
</el-select>
</el-form-item>
<el-form-item label="点位编码" prop="code">
<el-input v-model="form.code" disabled style="width: 370px;"/>
<el-input v-model="form.code" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="点位名称" prop="name">
<el-input v-model="form.name" disabled style="width: 370px;"/>
<el-input v-model="form.name" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;"/>
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="绑定/解绑" prop="priority">
<el-select
@@ -185,7 +185,7 @@
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch v-model="form.is_used" :active-value=true :inactive-value=false />
<el-switch v-model="form.is_used" :active-value="true" :inactive-value="false" />
</el-form-item>
<el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
<el-select
@@ -204,16 +204,16 @@
</el-form-item>
<el-form-item label="位置" prop="point_location">
<el-input v-model="form.point_location" clearable style="width: 370px;"/>
<el-input v-model="form.point_location" clearable style="width: 370px;" />
</el-form-item>
<!-- <el-form-item label="优先级" prop="priority">-->
<!-- <el-input v-model="form.priority" clearable style="width: 370px;"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="优先级" prop="priority">-->
<!-- <el-input v-model="form.priority" clearable style="width: 370px;"/>-->
<!-- </el-form-item>-->
<el-form-item label="表单数据" prop="form_data">
<el-input type="textarea" v-model="form.form_data" clearable style="width: 370px;"/>
<el-input v-model="form.form_data" type="textarea" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea"/>
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -230,10 +230,10 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column type="selection" width="55" />
<el-table-column prop="code" label="点位编码" sortable width="120" show-overflow-tooltip />
<el-table-column prop="name" label="点位名称" width="150" sortable show-overflow-tooltip/>
<el-table-column prop="region_code" label="区域编码" min-width="120" show-overflow-tooltip/>
<el-table-column prop="name" label="点位名称" width="150" sortable show-overflow-tooltip />
<el-table-column prop="region_code" label="区域编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_type" label="点位类型">
<template slot-scope="scope">
{{ scope.row.point_type == '1' ? '满货架' : '空货架' }}
@@ -249,16 +249,22 @@
{{ scope.row.is_used == '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" min-width="120" show-overflow-tooltip/>
<!-- <el-table-column prop="priority" label="优先级"/>-->
<!-- <el-table-column prop="point_location" label="位置" min-width="120" show-overflow-tooltip/>-->
<!-- <el-table-column prop="group_code" label="点位组编码" min-width="120" show-overflow-tooltip/>-->
<!-- <el-table-column prop="form_data" label="表单数据" min-width="120" show-overflow-tooltip/>-->
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip/>
<el-table-column prop="create_name" label="创建人"/>
<el-table-column prop="create_time" label="创建时间" width="150"/>
<el-table-column prop="update_name" label="修改人" width="100"/>
<el-table-column prop="update_time" label="修改时间" width="150"/>
<el-table-column prop="vehicle_code" label="载具编码" min-width="120" show-overflow-tooltip />
<!-- <el-table-column prop="priority" label="优先级"/>-->
<!-- <el-table-column prop="point_location" label="位置" min-width="120" show-overflow-tooltip/>-->
<!-- <el-table-column prop="group_code" label="点位组编码" min-width="120" show-overflow-tooltip/>-->
<!-- <el-table-column prop="form_data" label="表单数据" min-width="120" show-overflow-tooltip/>-->
<el-table-column
prop="remark"
label="备注"
:min-width="flexWidth('remark' +
'',crud.data,'备注')"
show-overflow-tooltip
/>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150" />
<el-table-column prop="update_name" label="修改人" width="100" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column
v-permission="[]"
label="操作"
@@ -275,14 +281,14 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>
<script>
import crudPoint, {changeActive} from './point'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import crudPoint, { changeActive } from './point'
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'
@@ -311,8 +317,8 @@ const defaultForm = {
export default {
name: 'Point',
dicts: ['storagevehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'point_location', 'product_area'],
statusEnums: ['LOCK','REGION_INFO','POINT_TYPE','BIND_TYPE'],
components: {pagination, crudOperation, rrOperation, udOperation},
statusEnums: ['LOCK', 'REGION_INFO', 'POINT_TYPE', 'BIND_TYPE'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -326,7 +332,7 @@ export default {
download: false,
reset: true
},
crudMethod: {...crudPoint},
crudMethod: { ...crudPoint },
query: {
product_area: 'A2'
}
@@ -343,19 +349,19 @@ export default {
permission: {},
rules: {
code: [
{required: true, message: '点位编码不能为空', trigger: 'blur'}
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
],
name: [
{required: true, message: '点位名称不能为空', trigger: 'blur'}
{ required: true, message: '点位名称不能为空', trigger: 'blur' }
],
point_type: [
{required: true, message: '点位类型不能为空', trigger: 'blur'}
{ required: true, message: '点位类型不能为空', trigger: 'blur' }
],
priority: [
{required: true, message: '绑定或解绑操作不能为空', trigger: 'blur'}
{ required: true, message: '绑定或解绑操作不能为空', trigger: 'blur' }
],
lock_type: [
{required: true, message: '锁定类型不能为空', trigger: 'blur'}
{ required: true, message: '锁定类型不能为空', trigger: 'blur' }
]
}
}
@@ -415,7 +421,7 @@ export default {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
}
}
}
</script>